Move IdentityProvider usage from GCMDriverDesktop to GCMProfileService

chrome/browser/services/gcm/gcm_profile_service.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_
 #define CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 36 matching lines @@
   // TODO(jianli): obsolete methods that are going to be removed soon.
   void AddAppHandler(const std::string& app_id, GCMAppHandler* handler);
   void RemoveAppHandler(const std::string& app_id);
   void Register(const std::string& app_id,
                 const std::vector<std::string>& sender_ids,
                 const GCMDriver::RegisterCallback& callback);
 
   // 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);
 
   GCMDriver* driver() const { return driver_.get(); }
 
   content::PushMessagingService* push_messaging_service() {
     return &push_messaging_service_;
   }
 
  protected:
   // Used for constructing fake GCMProfileService for testing purpose.
   GCMProfileService();
 
  private:
   // The profile which owns this object.
   Profile* profile_;
 
   scoped_ptr<GCMDriver> driver_;
 
   // 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);
 };
 
 }  // namespace gcm
 
 #endif  // CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_