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

chrome/browser/chromeos/contacts/google_contact_store.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/chromeos/contacts/google_contact_store.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 111 matching lines @@
 }
 
 void GoogleContactStore::Init() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Create a GData service if one hasn't already been assigned for testing.
   if (!gdata_service_.get()) {
     std::vector<std::string> scopes;
     scopes.push_back(kContactsScope);
 
+    ProfileOAuth2TokenService* oauth2_service =
+        ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
     gdata_service_.reset(new GDataContactsService(
         url_request_context_getter_,
         new google_apis::AuthService(
-            ProfileOAuth2TokenServiceFactory::GetForProfile(profile_),
+            oauth2_service,
+            oauth2_service->GetPrimaryAccountId(),
             url_request_context_getter_, scopes)));
   }
 
   base::FilePath db_path = profile_->GetPath().Append(kDatabaseDirectoryName);
   VLOG(1) << "Initializing contact database \"" << db_path.value() << "\" for "
           << profile_->GetProfileName();
   db_->Init(db_path,
             base::Bind(&GoogleContactStore::OnDatabaseInitialized,
                        weak_ptr_factory_.GetWeakPtr()));
 }
@@ skipping 272 matching lines @@
 }
 
 ContactStore* GoogleContactStoreFactory::CreateContactStore(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(CanCreateContactStoreForProfile(profile));
   return new GoogleContactStore(
       g_browser_process->system_request_context(), profile);
 }
 
 }  // namespace contacts