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

chrome/browser/extensions/api/push_messaging/push_messaging_api.cc

Index: chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
index 651281c77f81218c2341295206e7c00a294cc825..a8604ff21c43b5e0f5cd71b33bef6c8dfda9804c 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc
@@ -22,6 +22,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chrome/browser/signin/signin_manager.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/extensions/api/push_messaging.h"
 #include "content/public/browser/browser_thread.h"
@@ -124,8 +126,10 @@ void PushMessagingGetChannelIdFunction::StartAccessTokenFetch() {
   OAuth2TokenService::ScopeSet scopes(scope_vector.begin(), scope_vector.end());
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(GetProfile());
+  SigninManagerBase* signin_manager =
+      SigninManagerFactory::GetForProfile(GetProfile());
   fetcher_access_token_request_ = token_service->StartRequest(
-      token_service->GetPrimaryAccountId(), scopes, this);
+      signin_manager->GetAuthenticatedAccountId(), scopes, this);
 }
 
 void PushMessagingGetChannelIdFunction::OnRefreshTokenAvailable(
@@ -188,8 +192,10 @@ void PushMessagingGetChannelIdFunction::StartGaiaIdFetch(
 bool PushMessagingGetChannelIdFunction::IsUserLoggedIn() const {
   ProfileOAuth2TokenService* token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(GetProfile());

[dcheng, 2014/02/04 22:37:21]

Can all references to POA2TSF be deleted from this file and the includes
removed?

[Roger Tawa OOO till Jul 10th, 2014/02/05 01:00:49]

Nope.  You can see that the token service is still use at line 197 below and
several other places in the file.

+  SigninManagerBase* signin_manager =
+      SigninManagerFactory::GetForProfile(GetProfile());
   return token_service->RefreshTokenIsAvailable(
-      token_service->GetPrimaryAccountId());
+      signin_manager->GetAuthenticatedAccountId());
 }
 
 void PushMessagingGetChannelIdFunction::ReportResult(