Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAccountId.

chrome/browser/invalidation/ticl_invalidation_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/invalidation/ticl_invalidation_service.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/invalidation/invalidation_service_util.h"
@@ skipping 153 matching lines @@
 void TiclInvalidationService::RequestAccessToken() {
   // Only one active request at a time.
   if (access_token_request_ != NULL)
     return;
   request_access_token_retry_timer_.Stop();
   OAuth2TokenService::ScopeSet oauth2_scopes;
   for (size_t i = 0; i < arraysize(kOAuth2Scopes); i++)
     oauth2_scopes.insert(kOAuth2Scopes[i]);
   // Invalidate previous token, otherwise token service will return the same
   // token again.
-  const std::string& account_id = oauth2_token_service_->GetPrimaryAccountId();
+  const std::string& account_id = signin_manager_->GetAuthenticatedAccountId();
   oauth2_token_service_->InvalidateToken(account_id,
                                          oauth2_scopes,
                                          access_token_);
   access_token_.clear();
   access_token_request_ = oauth2_token_service_->StartRequest(account_id,
                                                               oauth2_scopes,
                                                               this);
 }
 
 void TiclInvalidationService::OnGetTokenSuccess(
@@ skipping 37 matching lines @@
       break;
     }
     default: {
       // We have no way to notify the user of this.  Do nothing.
     }
   }
 }
 
 void TiclInvalidationService::OnRefreshTokenAvailable(
     const std::string& account_id) {
-  if (oauth2_token_service_->GetPrimaryAccountId() == account_id) {
+  if (signin_manager_->GetAuthenticatedAccountId() == account_id) {
     if (!IsStarted() && IsReadyToStart()) {
       StartInvalidator(PUSH_CLIENT_CHANNEL);
     }
   }
 }
 
 void TiclInvalidationService::OnRefreshTokenRevoked(
     const std::string& account_id) {
-  if (oauth2_token_service_->GetPrimaryAccountId() == account_id) {
+  if (signin_manager_->GetAuthenticatedAccountId() == account_id) {
     access_token_.clear();
     if (IsStarted()) {
       UpdateInvalidatorCredentials();
     }
   }
 }
 
 void TiclInvalidationService::OnInvalidatorStateChange(
     syncer::InvalidatorState state) {
   if (state == syncer::INVALIDATION_CREDENTIALS_REJECTED) {
@@ skipping 42 matching lines @@
   }
 
   if (!oauth2_token_service_) {
     DVLOG(2)
         << "Not starting TiclInvalidationService: "
         << "OAuth2TokenService unavailable.";
     return false;
   }
 
   if (!oauth2_token_service_->RefreshTokenIsAvailable(
-          oauth2_token_service_->GetPrimaryAccountId())) {
+          signin_manager_->GetAuthenticatedAccountId())) {
     DVLOG(2)
         << "Not starting TiclInvalidationServce: Waiting for refresh token.";
     return false;
   }
 
   return true;
 }
 
 bool TiclInvalidationService::IsStarted() {
   return invalidator_.get() != NULL;
@@ skipping 84 matching lines @@
   }
 
   // This service always expects to have a valid invalidator storage.
   // So we must not only clear the old one, but also start a new one.
   invalidator_storage_->Clear();
   invalidator_storage_.reset(new InvalidatorStorage(profile_->GetPrefs()));
   invalidator_storage_->SetInvalidatorClientId(GenerateInvalidatorClientId());
 }
 
 }  // namespace invalidation