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

chrome/browser/signin/google_auto_login_helper.cc

 // Copyright 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/signin/google_auto_login_helper.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_constants.h"
 
 GoogleAutoLoginHelper::GoogleAutoLoginHelper(Profile* profile)
     : profile_(profile) {}
 
 GoogleAutoLoginHelper::~GoogleAutoLoginHelper() {
   DCHECK(accounts_.empty());
 }
 
-void GoogleAutoLoginHelper::LogIn() {
-  // This is the code path for non-mirror world.
-  uber_token_fetcher_.reset(CreateNewUbertokenFetcher());
-  uber_token_fetcher_->StartFetchingToken();
-  DCHECK(accounts_.empty());
-}
-
 void GoogleAutoLoginHelper::LogIn(const std::string& account_id) {
   if (uber_token_fetcher_.get()) {

[blundell, 2014/01/09 16:44:07]

Is there anything I can do to preserve the DCHECK that was existing above for
the non-mirror case? Is there any danger that uber_token_fetcher_ will be
non-NULL in the non-mirror case?

[Roger Tawa OOO till Jul 10th, 2014/01/10 00:08:14]

No need.  When I land https://codereview.chromium.org/110373007/, LogIn() will
be implemented by calling LogIn(string), so DCHECK is gone.  That DCHCK
essentially protects the reassignment to |uber_token_fetcher_|, which would
break if done concurrently with  a call to calling LogIn(string).

     accounts_.push_back(account_id);
   } else {
     uber_token_fetcher_.reset(CreateNewUbertokenFetcher());
     uber_token_fetcher_->StartFetchingToken(account_id);
   }
 }
 
 void GoogleAutoLoginHelper::OnUbertokenSuccess(const std::string& uber_token) {
   VLOG(1) << "GoogleAutoLoginHelper::OnUbertokenSuccess";
   gaia_auth_fetcher_.reset(CreateNewGaiaAuthFetcher());
@@ skipping 43 matching lines @@
 
 UbertokenFetcher* GoogleAutoLoginHelper::CreateNewUbertokenFetcher() {
   return new UbertokenFetcher(profile_, this);
 }
 
 GaiaAuthFetcher* GoogleAutoLoginHelper::CreateNewGaiaAuthFetcher() {
  return new GaiaAuthFetcher(
       this, GaiaConstants::kChromeSource, profile_->GetRequestContext());
 }