Adding service_name to GaiaOAuthFetcher

chrome/browser/chromeos/login/login_utils.cc

 // Copyright (c) 2011 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/login/login_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 138 matching lines @@
 
 // Verifies OAuth1 access token by performing OAuthLogin.
 class OAuthLoginVerifier : public GaiaOAuthConsumer {
  public:
   OAuthLoginVerifier(Profile* user_profile,
                      const std::string& oauth1_token,
                      const std::string& oauth1_secret)
       : oauth_fetcher_(this,
             user_profile->GetOffTheRecordProfile()->GetRequestContext(),
             user_profile->GetOffTheRecordProfile(),
+            GaiaConstants::kSyncService,
             kServiceScopeChromeOS),
         oauth1_token_(oauth1_token),
         oauth1_secret_(oauth1_secret) {
   }
   virtual ~OAuthLoginVerifier() {}
 
   void Start() {
     oauth_fetcher_.StartOAuthLogin(GaiaConstants::kChromeOSSource,
                                    GaiaConstants::kContactsService,
                                    oauth1_token_,
@@ skipping 24 matching lines @@
 
 // Fetches an OAuth token and initializes user policy with it.
 class PolicyOAuthFetcher : public GaiaOAuthConsumer {
  public:
   PolicyOAuthFetcher(Profile* profile,
                      const std::string& oauth1_token,
                      const std::string& oauth1_secret)
       : oauth_fetcher_(this,
                        profile->GetRequestContext(),
                        profile,
+                       GaiaConstants::kDeviceManagementService,
                        kServiceScopeChromeOSDeviceManagement),
         oauth1_token_(oauth1_token),
         oauth1_secret_(oauth1_secret) {
     oauth_fetcher_.SetAutoFetchLimit(
         GaiaOAuthFetcher::OAUTH2_SERVICE_ACCESS_TOKEN);
   }
   virtual ~PolicyOAuthFetcher() {}
 
   void Start() {
     oauth_fetcher_.StartOAuthWrapBridge(oauth1_token_, oauth1_secret_, "3600",
+        std::string(GaiaConstants::kDeviceManagementService),
         std::string(kServiceScopeChromeOSDeviceManagement));
   }
 
   // GaiaOAuthConsumer implementation:
   virtual void OnOAuthWrapBridgeSuccess(
+      const std::string& service_name,
       const std::string& token,
       const std::string& expires_in) OVERRIDE {
     policy::BrowserPolicyConnector* browser_policy_connector =
         g_browser_process->browser_policy_connector();
     browser_policy_connector->RegisterForUserPolicy(token);
   }
 
   virtual void OnOAuthWrapBridgeFailure(
       const GoogleServiceAuthError& error) OVERRIDE {
     LOG(WARNING) << "Failed to get OAuth access token.";
@@ skipping 330 matching lines @@
   delegate_->OnProfilePrepared(user_profile);
 
   // TODO(altimofeev): Need to sanitize memory used to store password.
   credentials_ = GaiaAuthConsumer::ClientLoginResult();
 }
 
 void LoginUtilsImpl::FetchOAuth1AccessToken(Profile* auth_profile) {
   oauth_fetcher_.reset(new GaiaOAuthFetcher(this,
                                             auth_profile->GetRequestContext(),
                                             auth_profile,
+                                            GaiaConstants::kSyncService,
                                             kServiceScopeChromeOS));
   // Let's first get the Oauth request token and OAuth1 token+secret.
   // One we get that, we will kick off individial requests for OAuth2 tokens for
   // all our services.
   oauth_fetcher_->SetAutoFetchLimit(GaiaOAuthFetcher::OAUTH1_ALL_ACCESS_TOKEN);
   oauth_fetcher_->StartGetOAuthTokenRequest();
 }
 
 void LoginUtilsImpl::FetchCookies(
     Profile* profile,
@@ skipping 374 matching lines @@
   // Mark login host for deletion after browser starts.  This
   // guarantees that the message loop will be referenced by the
   // browser before it is dereferenced by the login host.
   if (login_host) {
     login_host->OnSessionStart();
     login_host = NULL;
   }
 }
 
 }  // namespace chromeos