Adding service_name to GaiaOAuthFetcher

chrome/browser/chromeos/login/login_utils.cc

Index: chrome/browser/chromeos/login/login_utils.cc
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index 9db001eb1cf974668938a3319888524e9213642c..aec0b307a0d36bfa541c31b9d8dc56eafc6a5ae7 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -156,6 +156,7 @@ class OAuthLoginVerifier : public GaiaOAuthConsumer {
       : oauth_fetcher_(this,
             user_profile->GetOffTheRecordProfile()->GetRequestContext(),
             user_profile->GetOffTheRecordProfile(),
+            GaiaConstants::kSyncService,
             kServiceScopeChromeOS),
         oauth1_token_(oauth1_token),
         oauth1_secret_(oauth1_secret) {
@@ -200,6 +201,7 @@ class PolicyOAuthFetcher : public GaiaOAuthConsumer {
       : oauth_fetcher_(this,
                        profile->GetRequestContext(),
                        profile,
+                       GaiaConstants::kSyncService,

[Mattias Nissler (ping if slow), 2011/08/03 08:36:26]

If I understand correctly, this is the GAIA service name. For policy, this is
actually "mobilesync", i.e. GaiaConstants::kDeviceManagementService.

[Rick Campbell, 2011/08/03 13:07:06]

Done.

                        kServiceScopeChromeOSDeviceManagement),
         oauth1_token_(oauth1_token),
         oauth1_secret_(oauth1_secret) {
@@ -210,11 +212,13 @@ class PolicyOAuthFetcher : public GaiaOAuthConsumer {
 
   void Start() {
     oauth_fetcher_.StartOAuthWrapBridge(oauth1_token_, oauth1_secret_, "3600",
+        std::string(GaiaConstants::kSyncService),

[Rick Campbell, 2011/08/03 13:07:06]

This has the same issue that Mattias identified above.

         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 =
@@ -565,6 +569,7 @@ 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