[GCM] Create and use event router in GCMProfileService

chrome/browser/services/gcm/gcm_profile_service.h

Index: chrome/browser/services/gcm/gcm_profile_service.h
diff --git a/chrome/browser/services/gcm/gcm_profile_service.h b/chrome/browser/services/gcm/gcm_profile_service.h
index b7c0132fd595dbbf652de7856d84bdeb19b5a7a5..4dc2be088cb86743643fa74c2bccfa0d2976c83e 100644
--- a/chrome/browser/services/gcm/gcm_profile_service.h
+++ b/chrome/browser/services/gcm/gcm_profile_service.h
@@ -160,7 +160,7 @@ class GCMProfileService : public BrowserContextKeyedService,
   void GCMClientLoadingFinished();
 
   // Returns the event router to fire the event for the given app.
-  GCMEventRouter* GetEventRouter(const std::string& app_id);
+  GCMEventRouter* GetEventRouter(const std::string& app_id) const;
 
   // Used to persist registration info into the app's state store.
   void DeleteRegistrationInfo(const std::string& app_id);
@@ -206,7 +206,9 @@ class GCMProfileService : public BrowserContextKeyedService,
   RegistrationInfoMap registration_info_map_;
 
   // Event router to talk with JS API.
+#if !defined(OS_ANDROID)
   scoped_ptr<GCMEventRouter> js_event_router_;
+#endif
 
   // For testing purpose.
   TestingDelegate* testing_delegate_;