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

chrome/browser/chromeos/extensions/file_manager/private_api_misc.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/chromeos/extensions/file_manager/private_api_misc.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 211 matching lines @@
 }
 
 FileBrowserPrivateRequestWebStoreAccessTokenFunction::
     ~FileBrowserPrivateRequestWebStoreAccessTokenFunction() {
 }
 
 bool FileBrowserPrivateRequestWebStoreAccessTokenFunction::RunImpl() {
   std::vector<std::string> scopes;
   scopes.push_back(kCWSScope);
 
-  OAuth2TokenService* oauth_service =
+  ProfileOAuth2TokenService* oauth_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile());
   net::URLRequestContextGetter* url_request_context_getter =
       g_browser_process->system_request_context();
 
   if (!oauth_service) {
     drive::util::Log(logging::LOG_ERROR,
                      "CWS OAuth token fetch failed. OAuth2TokenService can't "
                      "be retrived.");
     SetResult(base::Value::CreateNullValue());
     return false;
   }
 
   auth_service_.reset(new google_apis::AuthService(
       oauth_service,
+      oauth_service->GetPrimaryAccountId(),
       url_request_context_getter,
       scopes));
   auth_service_->StartAuthentication(base::Bind(
       &FileBrowserPrivateRequestWebStoreAccessTokenFunction::
           OnAccessTokenFetched,
       this));
 
   return true;
 }
 
@@ skipping 11 matching lines @@
   } else {
     drive::util::Log(logging::LOG_ERROR,
                      "CWS OAuth token fetch failed. (GDataErrorCode: %s)",
                      google_apis::GDataErrorCodeToString(code).c_str());
     SetResult(base::Value::CreateNullValue());
     SendResponse(false);
   }
 }
 
 }  // namespace extensions