Move IdentityProvider usage from GCMDriverDesktop to GCMProfileService

chrome/browser/services/gcm/gcm_profile_service.cc

 // 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.
 
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
@@ skipping 40 matching lines @@
 }
 #else
 GCMProfileService::GCMProfileService(
     Profile* profile,
     scoped_ptr<GCMClientFactory> gcm_client_factory)
     : profile_(profile) {
   DCHECK(!profile->IsOffTheRecord());
 
   driver_ = CreateGCMDriverDesktop(
       gcm_client_factory.Pass(),
-      scoped_ptr<IdentityProvider>(new ProfileIdentityProvider(
-          SigninManagerFactory::GetForProfile(profile_),
-          ProfileOAuth2TokenServiceFactory::GetForProfile(profile_),
-          LoginUIServiceFactory::GetForProfile(profile_))),
       profile_->GetPath().Append(chrome::kGCMStoreDirname),
       profile_->GetRequestContext());
+
+  identity_provider_.reset(new ProfileIdentityProvider(
+      SigninManagerFactory::GetForProfile(profile_),
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_),
+      LoginUIServiceFactory::GetForProfile(profile_)));
+  identity_provider_->AddObserver(this);
+
+  OnActiveAccountLogin();
 }
 #endif  // defined(OS_ANDROID)
 
 GCMProfileService::GCMProfileService() : profile_(NULL) {
 }
 
 GCMProfileService::~GCMProfileService() {
 }
 
 void GCMProfileService::AddAppHandler(const std::string& app_id,
@@ skipping 12 matching lines @@
                                  const GCMDriver::RegisterCallback& callback) {
   if (driver_)
     driver_->Register(app_id, sender_ids, callback);
 }
 
 void GCMProfileService::Shutdown() {
   if (driver_) {
     driver_->Shutdown();
     driver_.reset();
   }
+
+#if !defined(OS_ANDROID)
+  if (identity_provider_) {
+    identity_provider_->RemoveObserver(this);
+    identity_provider_.reset();
+  }
+#endif  // !defined(OS_ANDROID)
+}
+
+#if !defined(OS_ANDROID)
+void GCMProfileService::OnActiveAccountLogin() {
+  if (!driver_)
+    return;
+
+  // This might be called multiple times when the password changes.
+  std::string account_id = identity_provider_->GetActiveAccountId();

[bartfab (slow), 2014/06/13 11:27:21]

Nit: const.

[jianli, 2014/06/13 18:04:48]

Done.

+  if (account_id == account_id_)
+    return;
+  account_id_ = account_id;
+
+  driver_->SignIn();
+}
+
+void GCMProfileService::OnActiveAccountLogout() {
+  if (driver_)
+    driver_->Purge();
+}
+#endif  // !defined(OS_ANDROID)
+
+std::string GCMProfileService::SignedInUserName() const {
+#if !defined(OS_ANDROID)
+  if (driver_.get() && driver_->IsStarted())

[bartfab (slow), 2014/06/13 11:27:21]

Nit: scoped_ptr is testable. No need for .get():

if (driver_ && driver_->IsStarted())

[jianli, 2014/06/13 18:04:48]

Done.

+    return account_id_;
+#endif  // !defined(OS_ANDROID)
+  return std::string();
 }
 
 void GCMProfileService::SetDriverForTesting(GCMDriver* driver) {
   driver_.reset(driver);
 }
 
 }  // namespace gcm