Pass Device ID in the oauth2/token request. Keep Device ID in local state on Chrome OS.

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.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/ui/webui/chromeos/login/gaia_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 135 matching lines @@
 }
 
 }  // namespace
 
 GaiaContext::GaiaContext()
     : force_reload(false),
       is_local(false),
       password_changed(false),
       show_users(false),
       use_offline(false),
-      has_users(false),
-      session_is_ephemeral(false) {
+      has_users(false) {
 }
 
 GaiaScreenHandler::GaiaScreenHandler(
     CoreOobeActor* core_oobe_actor,
     const scoped_refptr<NetworkStateInformer>& network_state_informer,
     policy::ConsumerManagementService* consumer_management)
     : BaseScreenHandler(kJsScreenPath),
       frame_state_(FRAME_STATE_UNKNOWN),
       frame_error_(net::OK),
       network_state_informer_(network_state_informer),
@@ skipping 43 matching lines @@
 
   params.SetBoolean("forceReload", context.force_reload);
   params.SetBoolean("isLocal", context.is_local);
   params.SetBoolean("passwordChanged", context.password_changed);
   params.SetBoolean("isShowUsers", context.show_users);
   params.SetBoolean("useOffline", context.use_offline);
   params.SetString("gaiaId", context.gaia_id);
   params.SetString("email", context.email);
   params.SetBoolean("isEnrollingConsumerManagement",
                     is_enrolling_consumer_management);
-  if (StartupUtils::IsWebviewSigninEnabled()) {
-    params.SetString("deviceId", context.device_id);
-    params.SetBoolean("sessionIsEphemeral", context.session_is_ephemeral);
-  }
 
   UpdateAuthParams(&params,
                    context.has_users,
                    is_enrolling_consumer_management);
 
   if (!context.use_offline) {
     const std::string app_locale = g_browser_process->GetApplicationLocale();
     if (!app_locale.empty())
       params.SetString("hl", app_locale);
   } else {
@@ skipping 96 matching lines @@
     params.SetString("clientId",
                      GaiaUrls::GetInstance()->oauth2_chrome_client_id());
   }
 
   frame_state_ = FRAME_STATE_LOADING;
   CallJS("loadAuthExtension", params);
 }
 
 void GaiaScreenHandler::UpdateGaia(const GaiaContext& context) {
   base::DictionaryValue params;
-  if (StartupUtils::IsWebviewSigninEnabled()) {
-    params.SetString("deviceId", context.device_id);
-  }
   UpdateAuthParams(&params, context.has_users,
                    context.is_enrolling_consumer_management);
   CallJS("updateAuthExtension", params);
 }
 
 void GaiaScreenHandler::ReloadGaia(bool force_reload) {
   if (frame_state_ == FRAME_STATE_LOADING && !force_reload) {
     VLOG(1) << "Skipping reloading of Gaia since gaia is loading.";
     return;
   }
@@ skipping 142 matching lines @@
       NetworkError::ERROR_REASON_FRAME_ERROR;
   frame_state_ = FRAME_STATE_ERROR;
   UpdateState(error_reason);
 }
 
 void GaiaScreenHandler::HandleCompleteAuthentication(
     const std::string& gaia_id,
     const std::string& email,
     const std::string& password,
     const std::string& auth_code,
-    bool using_saml,
-    const std::string& device_id) {
+    bool using_saml) {
   if (!Delegate())
     return;
 
   RecordGAIAFlowTypeHistogram();
 
   DCHECK(!email.empty());
   DCHECK(!gaia_id.empty());
   const std::string sanitized_email = gaia::SanitizeEmail(email);
   Delegate()->SetDisplayEmail(sanitized_email);
   UserContext user_context(sanitized_email);
   user_context.SetGaiaID(gaia_id);
   user_context.SetKey(Key(password));
   user_context.SetAuthCode(auth_code);
   user_context.SetAuthFlow(using_saml
                                ? UserContext::AUTH_FLOW_GAIA_WITH_SAML
                                : UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
-  user_context.SetDeviceId(device_id);
   Delegate()->CompleteLogin(user_context);
 }
 
 void GaiaScreenHandler::HandleCompleteAuthenticationAuthCodeOnly(
     const std::string& auth_code) {
   if (!Delegate())
     return;
 
   RecordGAIAFlowTypeHistogram();
 
@@ skipping 60 matching lines @@
 
 void GaiaScreenHandler::HandleToggleEasyBootstrap() {
   use_easy_bootstrap_ = !use_easy_bootstrap_;
   const bool kForceReload = true;
   const bool kSilentLoad = true;
   const bool kNoOfflineUI = false;
   LoadAuthExtension(kForceReload, kSilentLoad, kNoOfflineUI);
 }
 
 void GaiaScreenHandler::HandleAttemptLogin(const std::string& email) {
-  std::string device_id =
-      user_manager::UserManager::Get()->GetKnownUserDeviceId(
-          gaia::CanonicalizeEmail(gaia::SanitizeEmail(email)));
-
-  if (!device_id.empty() && StartupUtils::IsWebviewSigninEnabled()) {
-    base::DictionaryValue params;
-    params.SetString("deviceId", device_id);
-    CallJS("updateDeviceId", params);
-  } else {
-    // Mark current temporary device Id as used.
-    temporary_device_id_ = std::string();
-  }
+  // Kept for future use.

[achuithb, 2015/05/12 23:25:01]

What does this comment mean?

[dzhioev (left Google), 2015/05/13 00:25:18]

I believe we are going to make whitelist checking here.
I'm OK with removing this method though, it can be returned back easily when
needed. Removed it. 

 }
 
 void GaiaScreenHandler::HandleGaiaUIReady() {
   if (focus_stolen_) {
     // Set focus to the Gaia page.
     // TODO(altimofeev): temporary solution, until focus parameters are
     // implemented on the Gaia side.
     // Do this only once. Any subsequent call would relod GAIA frame.
     focus_stolen_ = false;
     const char code[] =
@@ skipping 324 matching lines @@
 
   std::string gaia_id;
   if (user_manager::UserManager::Get()->FindGaiaID(context.email, &gaia_id))
     context.gaia_id = gaia_id;
 
   if (Delegate()) {
     context.show_users = Delegate()->IsShowUsers();
     context.has_users = !Delegate()->GetUsers().empty();
   }
 
-  if (!context.email.empty()) {
-    context.device_id = user_manager::UserManager::Get()->GetKnownUserDeviceId(
-        gaia::CanonicalizeEmail(context.email));
-  }
-
-  if (context.device_id.empty())
-    context.device_id = GetTemporaryDeviceId();
-
-  context.session_is_ephemeral =
-      ChromeUserManager::Get()->AreEphemeralUsersEnabled();
-
   populated_email_.clear();
 
   LoadGaia(context);
 }
 
 void GaiaScreenHandler::UpdateState(NetworkError::ErrorReason reason) {
   if (signin_screen_handler_)
     signin_screen_handler_->UpdateState(reason);
 }
 
 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
   DCHECK(signin_screen_handler_);
   return signin_screen_handler_->delegate_;
 }
 
 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
   signin_screen_handler_ = handler;
 }
 
-std::string GaiaScreenHandler::GetTemporaryDeviceId() {
-  if (temporary_device_id_.empty())
-    temporary_device_id_ = base::GenerateGUID();
-
-  DCHECK(!temporary_device_id_.empty());
-  return temporary_device_id_;
-}
-
 }  // namespace chromeos