[GCM] Passing GCMClient::AccountTokenInfo list to GCMDriver

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 <map>
+#include <vector>
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 
 #if defined(OS_ANDROID)
 #include "components/gcm_driver/gcm_driver_android.h"
 #else
@@ skipping 18 matching lines @@
 #include "net/url_request/url_request_context_getter.h"
 #endif
 
 namespace gcm {
 
 #if !defined(OS_ANDROID)
 // Identity observer only has actual work to do when the user is actually signed
 // in. It ensures that account tracker is taking
 class GCMProfileService::IdentityObserver : public IdentityProvider::Observer {
  public:
-  IdentityObserver(Profile* profile, GCMDriverDesktop* driver);
+  IdentityObserver(Profile* profile, GCMDriver* driver);
   virtual ~IdentityObserver();
 
   // IdentityProvider::Observer:
   virtual void OnActiveAccountLogin() OVERRIDE;
   virtual void OnActiveAccountLogout() OVERRIDE;
 
   std::string SignedInUserName() const;
 
   // Called to inform IdentityObserver that a list of accounts was updated.
-  // |account_tokens| maps email addresses to OAuth2 access tokens.
+  // |account_tokens| is a list of email addresses, account IDs and OAuth2
+  // access tokens.
   void AccountsUpdated(
-      const std::map<std::string, std::string>& account_tokens);
+      const std::vector<GCMClient::AccountTokenInfo>& account_tokens);
 
  private:
   Profile* profile_;
-  GCMDriverDesktop* driver_;
+  GCMDriver* driver_;
   scoped_ptr<IdentityProvider> identity_provider_;
   scoped_ptr<GCMAccountTracker> gcm_account_tracker_;
 
   // The account ID that this service is responsible for. Empty when the service
   // is not running.
   std::string account_id_;
 
   base::WeakPtrFactory<GCMProfileService::IdentityObserver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IdentityObserver);
 };
 
 GCMProfileService::IdentityObserver::IdentityObserver(Profile* profile,
-                                                      GCMDriverDesktop* driver)
+                                                      GCMDriver* driver)
     : profile_(profile), driver_(driver), weak_ptr_factory_(this) {
   identity_provider_.reset(new ProfileIdentityProvider(
       SigninManagerFactory::GetForProfile(profile),
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
       LoginUIServiceFactory::GetForProfile(profile)));
   identity_provider_->AddObserver(this);
 
   OnActiveAccountLogin();
 }
 
@@ skipping 37 matching lines @@
   // again. Otherwise, the user sign-out will not affect the existing GCM
   // data.
   driver_->OnSignedOut();
 }
 
 std::string GCMProfileService::IdentityObserver::SignedInUserName() const {
   return driver_->IsStarted() ? account_id_ : std::string();
 }
 
 void GCMProfileService::IdentityObserver::AccountsUpdated(
-    const std::map<std::string, std::string>& account_tokens) {
-  driver_->SetAccountsForCheckin(account_tokens);
+    const std::vector<GCMClient::AccountTokenInfo>& account_tokens) {
+  driver_->SetAccountTokens(account_tokens);
 }
 #endif  // !defined(OS_ANDROID)
 
 // static
 bool GCMProfileService::IsGCMEnabled(Profile* profile) {
   return profile->GetPrefs()->GetBoolean(prefs::kGCMChannelEnabled);
 }
 
 // static
 void GCMProfileService::RegisterProfilePrefs(
@@ skipping 25 matching lines @@
       gcm_client_factory.Pass(),
       profile_->GetPrefs(),
       profile_->GetPath().Append(chrome::kGCMStoreDirname),
       profile_->GetRequestContext());
 
 #if defined(OS_CHROMEOS)
   chromeos_connection_observer_.reset(new gcm::ChromeOSGCMConnectionObserver);
   driver_->AddConnectionObserver(chromeos_connection_observer_.get());
 #endif
 
-  identity_observer_.reset(new IdentityObserver(
-      profile, static_cast<gcm::GCMDriverDesktop*>(driver_.get())));
+  identity_observer_.reset(new IdentityObserver(profile, driver_.get()));
 }
 #endif  // defined(OS_ANDROID)
 
 GCMProfileService::GCMProfileService()
     : profile_(NULL),
       push_messaging_service_(this, NULL) {
 }
 
 GCMProfileService::~GCMProfileService() {
 }
@@ skipping 37 matching lines @@
   return identity_observer_ ? identity_observer_->SignedInUserName()
                             : std::string();
 #endif  // defined(OS_ANDROID)
 }
 
 void GCMProfileService::SetDriverForTesting(GCMDriver* driver) {
   driver_.reset(driver);
 }
 
 }  // namespace gcm