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"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/services/gcm/push_messaging_service_impl.h"
 // TODO(jianli): include needed for obsolete methods that are going to be
 // removed soon.
 #include "components/gcm_driver/gcm_driver.h"
 #include "components/keyed_service/core/keyed_service.h"
 
+#if !defined(OS_ANDROID)
+#include "google_apis/gaia/identity_provider.h"
+#endif
+
 class Profile;
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace gcm {
 
 class GCMClientFactory;
 class GCMDriver;
 
 // Providing GCM service, via GCMDriver, to a profile.
+#if defined(OS_ANDROID)
 class GCMProfileService : public KeyedService {
+#else
+class GCMProfileService : public KeyedService,

[Nicolas Zea, 2014/06/13 19:49:31]

Agree with Filip, I think it would be cleaner to not have the android and
non-android stuff all living within the same file. 

[jianli, 2014/06/13 21:58:04]

Per discussion, I added inner class IdentityObserver to encapsulate all the
identity provider logic. This will be removed once we drop the sign-in
enforcement.

+                          public IdentityProvider::Observer {
+#endif
  public:
   // Returns whether GCM is enabled for |profile|.
   static bool IsGCMEnabled(Profile* profile);
 
   // Register profile-specific prefs for GCM.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
 #if defined(OS_ANDROID)
   explicit GCMProfileService(Profile* profile);
 #else
   GCMProfileService(Profile* profile,
                     scoped_ptr<GCMClientFactory> gcm_client_factory);
 #endif
   virtual ~GCMProfileService();
 
   // 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;
 
+#if !defined(OS_ANDROID)
+  // IdentityProvider::Observer:
+  virtual void OnActiveAccountLogin() OVERRIDE;
+  virtual void OnActiveAccountLogout() OVERRIDE;
+#endif
+
+  // Returns the user name if the profile is signed in or an empty string
+  // otherwise.
+  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_;
 
+#if !defined(OS_ANDROID)
+  scoped_ptr<IdentityProvider> identity_provider_;
+
+  // The account ID that this service is responsible for. Empty when the service
+  // is not running.
+  std::string account_id_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(GCMProfileService);
 };
 
 }  // namespace gcm
 
 #endif  // CHROME_BROWSER_SERVICES_GCM_GCM_PROFILE_SERVICE_H_