Move IdentityProvider usage from GCMDriverDesktop to 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 df05dbb3a7cbca0f8c14a8196b76c66689ca5def..abfd3ce9141e1313dca1d27b5b87873470069831 100644
--- a/chrome/browser/services/gcm/gcm_profile_service.h
+++ b/chrome/browser/services/gcm/gcm_profile_service.h
@@ -54,6 +54,11 @@ class GCMProfileService : public KeyedService {
   // KeyedService:
   virtual void Shutdown() OVERRIDE;
 
+  // Returns the user name if the profile is signed in or an empty string
+  // otherwise.
+  // TODO(jianli): To be removed when sign-in enforcement is dropped.
+  std::string SignedInUserName() const;
+
   // For testing purpose.
   void SetDriverForTesting(GCMDriver* driver);
 
@@ -76,6 +81,12 @@ class GCMProfileService : public KeyedService {
   // Implementation of content::PushMessagingService using GCMProfileService.
   PushMessagingServiceImpl push_messaging_service_;
 
+  // TODO(jianli): To be removed when sign-in enforcement is dropped.
+#if !defined(OS_ANDROID)
+  class IdentityObserver;
+  scoped_ptr<IdentityObserver> identity_observer_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(GCMProfileService);
 };