Pass signin_scoped_device_id to refresh token request on ChromeOS

chrome/browser/chromeos/login/signin/oauth2_login_manager.cc

 // Copyright 2014 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/signin/oauth2_login_manager.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
+#include "components/signin/core/browser/signin_client.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 179 matching lines @@
   account_id_fetcher_.reset();
   LOG(ERROR) << "Account id fetch failed! response_code=" << response_code;
   SetSessionRestoreState(OAuth2LoginManager::SESSION_RESTORE_FAILED);
 }
 
 void OAuth2LoginManager::FetchOAuth2Tokens() {
   DCHECK(auth_request_context_.get());
   // If we have authenticated cookie jar, get OAuth1 token first, then fetch
   // SID/LSID cookies through OAuthLogin call.
   if (restore_strategy_ == RESTORE_FROM_COOKIE_JAR) {
+    SigninClient* signin_client =
+        ChromeSigninClientFactory::GetForProfile(user_profile_);
+    std::string signin_scoped_device_id =
+        signin_client->GetSigninScopedDeviceId();
+
     oauth2_token_fetcher_.reset(
         new OAuth2TokenFetcher(this, auth_request_context_.get()));
-    oauth2_token_fetcher_->StartExchangeFromCookies(std::string());
+    oauth2_token_fetcher_->StartExchangeFromCookies(std::string(),
+                                                    signin_scoped_device_id);
   } else if (restore_strategy_ == RESTORE_FROM_AUTH_CODE) {
     DCHECK(!auth_code_.empty());
     oauth2_token_fetcher_.reset(
         new OAuth2TokenFetcher(this,
                                g_browser_process->system_request_context()));
     oauth2_token_fetcher_->StartExchangeFromAuthCode(auth_code_);
   } else {
     NOTREACHED();
     SetSessionRestoreState(OAuth2LoginManager::SESSION_RESTORE_FAILED);
   }
@@ skipping 160 matching lines @@
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     OnSessionRestoreStateChanged(user_profile_, state_));
 }
 
 void OAuth2LoginManager::SetSessionRestoreStartForTesting(
     const base::Time& time) {
   session_restore_start_ = time;
 }
 
 }  // namespace chromeos