Making OAuth2TokenService multi-login aware, updating callers, minor fixes

chrome/browser/managed_mode/managed_user_registration_utility.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/managed_mode/managed_user_registration_utility.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
@@ skipping 36 matching lines @@
 }
 
 ManagedUserRegistrationUtility::~ManagedUserRegistrationUtility() {
   managed_user_sync_service_->RemoveObserver(this);
   CancelPendingRegistration();
 }
 
 // static
 scoped_ptr<ManagedUserRegistrationUtility>
 ManagedUserRegistrationUtility::Create(Profile* profile) {
+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
   scoped_ptr<ManagedUserRefreshTokenFetcher> token_fetcher =
       ManagedUserRefreshTokenFetcher::Create(
-          ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
+          token_service,
+          token_service->GetPrimaryAccountId(),
           profile->GetRequestContext());
   ManagedUserSyncService* managed_user_sync_service =
       ManagedUserSyncServiceFactory::GetForProfile(profile);
   return make_scoped_ptr(new ManagedUserRegistrationUtility(
       profile->GetPrefs(), token_fetcher.Pass(), managed_user_sync_service));
 }
 
 // static
 std::string ManagedUserRegistrationUtility::GenerateNewManagedUserId() {
   std::string new_managed_user_id;
@@ skipping 101 matching lines @@
     bool success =
         update->RemoveWithoutPathExpansion(pending_managed_user_id_, NULL);
     DCHECK(success);
     managed_user_sync_service_->DeleteManagedUser(pending_managed_user_id_);
   }
 
   if (run_callback)
     callback_.Run(error, pending_managed_user_token_);
   callback_.Reset();
 }