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

chrome/browser/chromeos/contacts/google_contact_store.cc

Index: chrome/browser/chromeos/contacts/google_contact_store.cc
diff --git a/chrome/browser/chromeos/contacts/google_contact_store.cc b/chrome/browser/chromeos/contacts/google_contact_store.cc
index 45f03011adf637d300d5cef5f2b11e4d649efcdf..73a675236423189966184496045b53927b753819 100644
--- a/chrome/browser/chromeos/contacts/google_contact_store.cc
+++ b/chrome/browser/chromeos/contacts/google_contact_store.cc
@@ -129,10 +129,13 @@ void GoogleContactStore::Init() {
     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)));
   }