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

chrome/browser/google_apis/auth_service.h

Index: chrome/browser/google_apis/auth_service.h
diff --git a/chrome/browser/google_apis/auth_service.h b/chrome/browser/google_apis/auth_service.h
index ce22550d34a0e5e1ac90b8bf2239fa2e1d422f01..9ce41d8a566b88a9020767fe7b1d2e5efb5bf7d7 100644
--- a/chrome/browser/google_apis/auth_service.h
+++ b/chrome/browser/google_apis/auth_service.h
@@ -34,6 +34,7 @@ class AuthService : public AuthServiceInterface,
   //
   // |scopes| specifies OAuth2 scopes.
   AuthService(OAuth2TokenService* oauth2_token_service,
+              const std::string& account_id,
               net::URLRequestContextGetter* url_request_context_getter,
               const std::vector<std::string>& scopes);
   virtual ~AuthService();
@@ -63,6 +64,7 @@ class AuthService : public AuthServiceInterface,
                        const std::string& access_token);
 
   OAuth2TokenService* oauth2_token_service_;
+  std::string account_id_;
   net::URLRequestContextGetter* url_request_context_getter_;  // Not owned.
   bool has_refresh_token_;
   std::string access_token_;