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

chrome/browser/android/signin/signin_manager_android.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/android/signin/signin_manager_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 210 matching lines @@
     const std::string& primary_acct = token_service->GetPrimaryAccountId();
     const std::vector<std::string>& ids = token_service->GetAccounts();
     token_service->ValidateAccounts(primary_acct, ids);
 
   } else {
     DVLOG(1) << "SigninManagerAndroid::LogInSignedInUser "
         " Manually calling GoogleAutoLoginHelper";
     // Old code path that doesn't depend on the new Account Reconcilor.
     // We manually login.
 
+    ProfileOAuth2TokenService* token_service =
+        ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
     merge_session_helper_.reset(new GoogleAutoLoginHelper(profile_, this));
-    merge_session_helper_->LogIn();
+    merge_session_helper_->LogIn(token_service->GetPrimaryAccountId());
   }
 }
 
 static jlong Init(JNIEnv* env, jobject obj) {
   SigninManagerAndroid* signin_manager_android =
       new SigninManagerAndroid(env, obj);
   return reinterpret_cast<intptr_t>(signin_manager_android);
 }
 
 static jboolean ShouldLoadPolicyForUser(JNIEnv* env,
                                         jobject obj,
                                         jstring j_username) {
 #if defined(ENABLE_CONFIGURATION_POLICY)
   std::string username =
       base::android::ConvertJavaStringToUTF8(env, j_username);
   return !policy::BrowserPolicyConnector::IsNonEnterpriseUser(username);
 #else
   return false;
 #endif
 }
 
 // static
 bool SigninManagerAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }