Eliminate usage of PO2TS::GetPrimaryAccountID() in UbertokenFetcher.

chrome/browser/ui/auto_login_infobar_delegate.cc

 // Copyright (c) 2012 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/ui/auto_login_infobar_delegate.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #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/ubertoken_fetcher.h"
 #include "chrome/browser/ui/sync/sync_promo_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
@@ skipping 48 matching lines @@
   scoped_ptr<UbertokenFetcher> ubertoken_fetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoLoginRedirector);
 };
 
 AutoLoginRedirector::AutoLoginRedirector(
     content::WebContents* web_contents,
     const std::string& args)
     : content::WebContentsObserver(web_contents),
       args_(args) {
-  ubertoken_fetcher_.reset(new UbertokenFetcher(
-      Profile::FromBrowserContext(web_contents->GetBrowserContext()), this));
-  ubertoken_fetcher_->StartFetchingToken();
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
+  ubertoken_fetcher_.reset(new UbertokenFetcher(profile, this));
+  ubertoken_fetcher_->StartFetchingToken(token_service->GetPrimaryAccountId());
 }
 
 AutoLoginRedirector::~AutoLoginRedirector() {
 }
 
 void AutoLoginRedirector::WebContentsDestroyed(
     content::WebContents* web_contents) {
   // The WebContents that started this has been destroyed. The request must be
   // cancelled and this object must be deleted.
   ubertoken_fetcher_.reset();
@@ skipping 112 matching lines @@
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_GOOGLE_SIGNED_OUT, type);
   infobar()->RemoveSelf();
 }
 
 void AutoLoginInfoBarDelegate::RecordHistogramAction(Actions action) {
   UMA_HISTOGRAM_ENUMERATION("AutoLogin.Regular", action,
                             HISTOGRAM_BOUNDING_VALUE);
 }