Pass device_id/device_type to web flow token approval url.

chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc

 // Copyright (c) 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/extensions/api/identity/gaia_web_auth_flow.h"
 
 #include "base/debug/trace_event.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.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 "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/escape.h"
 
 namespace extensions {
 
@@ skipping 14 matching lines @@
                            token_key->account_id);
 
   const char kOAuth2RedirectPathFormat[] = "/%s#";
   const char kOAuth2AuthorizeFormat[] =
       "?response_type=token&approval_prompt=force&authuser=0&"
       "client_id=%s&"
       "scope=%s&"
       "origin=chrome-extension://%s/&"
       "redirect_uri=%s:/%s&"
       "hl=%s";
+  // Additional parameters to pass if device_id is enabled.
+  const char kOAuth2AuthorizeFormatDeviceIdAddendum[] =
+      "&device_id=%s&"
+      "device_type=chrome";
 
   std::vector<std::string> scopes(token_key->scopes.begin(),
                                   token_key->scopes.end());
   std::vector<std::string> client_id_parts;
   base::SplitString(oauth2_client_id, '.', &client_id_parts);
   std::reverse(client_id_parts.begin(), client_id_parts.end());
   redirect_scheme_ = JoinString(client_id_parts, '.');
+  std::string signin_scoped_device_id;
+  // profile_ can be nullptr in unittests.
+  SigninClient* signin_client =
+      profile_ ? ChromeSigninClientFactory::GetForProfile(profile_) : nullptr;
+  if (signin_client)
+    signin_scoped_device_id = signin_client->GetSigninScopedDeviceId();
 
   redirect_path_prefix_ = base::StringPrintf(kOAuth2RedirectPathFormat,
                                              token_key->extension_id.c_str());
 
-  auth_url_ =
-      GaiaUrls::GetInstance()->oauth2_auth_url().Resolve(base::StringPrintf(
-          kOAuth2AuthorizeFormat,
-          oauth2_client_id.c_str(),
-          net::EscapeUrlEncodedData(JoinString(scopes, ' '), true).c_str(),
-          token_key->extension_id.c_str(),
-          redirect_scheme_.c_str(),
-          token_key->extension_id.c_str(),
-          locale.c_str()));
+  std::string oauth2_authorize_params = base::StringPrintf(
+      kOAuth2AuthorizeFormat,
+      oauth2_client_id.c_str(),
+      net::EscapeUrlEncodedData(JoinString(scopes, ' '), true).c_str(),
+      token_key->extension_id.c_str(),
+      redirect_scheme_.c_str(),
+      token_key->extension_id.c_str(),
+      locale.c_str());
+  if (!signin_scoped_device_id.empty()) {
+    oauth2_authorize_params += base::StringPrintf(
+        kOAuth2AuthorizeFormatDeviceIdAddendum,
+        net::EscapeUrlEncodedData(signin_scoped_device_id, true).c_str());
+  }
+  auth_url_ = GaiaUrls::GetInstance()->oauth2_auth_url().Resolve(
+      oauth2_authorize_params);
 }
 
 GaiaWebAuthFlow::~GaiaWebAuthFlow() {
   TRACE_EVENT_ASYNC_END0("identity", "GaiaWebAuthFlow", this);
 
   if (web_flow_)
     web_flow_.release()->DetachDelegateAndDelete();
 }
 
 void GaiaWebAuthFlow::Start() {
@@ skipping 137 matching lines @@
 }
 
 scoped_ptr<WebAuthFlow> GaiaWebAuthFlow::CreateWebAuthFlow(GURL url) {
   return scoped_ptr<WebAuthFlow>(new WebAuthFlow(this,
                                                  profile_,
                                                  url,
                                                  WebAuthFlow::INTERACTIVE));
 }
 
 }  // namespace extensions