Remove usage of token argument to observers

R=arv
BUG=

Review URL: https://codereview.appspot.com/31340043