Browser tests for the new way of handling device ID in Chrome OS.

chrome/browser/chromeos/login/test/oobe_base_test.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/test/oobe_base_test.h"
 
 #include "base/command_line.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/test/https_forwarder.h"
+#include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/fake_shill_manager_client.h"
 #include "components/policy/core/common/policy_switches.h"
@@ skipping 95 matching lines @@
                                           kFakeLSIDCookie);
   }
 
   // Restart the thread as the sandbox host process has already been spawned.
   embedded_test_server()->RestartThreadAndListen();
 
   login_screen_load_observer_.reset(new content::WindowedNotificationObserver(
       chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
       content::NotificationService::AllSources()));
 
+  js_checker_.set_web_contents(LoginDisplayHostImpl::default_host()
+                                   ->GetWebUILoginView()
+                                   ->GetWebContents());
   ExtensionApiTest::SetUpOnMainThread();
 }
 
 void OobeBaseTest::TearDownOnMainThread() {
   // If the login display is still showing, exit gracefully.
   if (LoginDisplayHostImpl::default_host()) {
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::Bind(&chrome::AttemptExit));
     content::RunMessageLoop();
   }
@@ skipping 66 matching lines @@
       portal_state);
   network_portal_detector_->NotifyObserversForTesting();
 }
 
 base::Closure OobeBaseTest::SimulateNetworkPortalClosure() {
   return base::Bind(&OobeBaseTest::SimulateNetworkPortal,
                     base::Unretained(this));
 }
 
 void OobeBaseTest::JsExpect(const std::string& expression) {
-  bool result;
-  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
-      GetLoginUI()->GetWebContents(),
-      "window.domAutomationController.send(!!(" + expression + "));",
-       &result));
-  ASSERT_TRUE(result) << expression;
+  JS().ExpectTrue(expression);
 }
 
 content::WebUI* OobeBaseTest::GetLoginUI() {
   return static_cast<chromeos::LoginDisplayHostImpl*>(
       chromeos::LoginDisplayHostImpl::default_host())->GetOobeUI()->web_ui();
 }
 
 WebUILoginDisplay* OobeBaseTest::GetLoginDisplay() {
   ExistingUserController* controller =
       ExistingUserController::current_controller();
   CHECK(controller);
   return static_cast<WebUILoginDisplay*>(
       controller->login_display());
 }
 
 void OobeBaseTest::WaitForGaiaPageLoad() {
   WaitForSigninScreen();
 
   if (!use_webview())
     return;
 
   ASSERT_TRUE(content::ExecuteScript(

[achuithb, 2015/05/26 06:28:21]

Shouldn't you update this code as well?

[dzhioev (left Google), 2015/05/26 21:18:15]

Done.

       GetLoginUI()->GetWebContents(),
       "$('gaia-signin').gaiaAuthHost_.addEventListener('ready',"
       "function() {"
       "window.domAutomationController.setAutomationId(0);"
       "window.domAutomationController.send('GaiaReady');"
       "});"));
 
   content::DOMMessageQueue message_queue;
   std::string message;
   do {
@@ skipping 24 matching lines @@
       "document.getElementById('$FieldId').value = '$FieldValue';"
       "var e = new Event('input');"
       "document.getElementById('$FieldId').dispatchEvent(e);"
       "})();";
   ReplaceSubstringsAfterOffset(&js, 0, "$FieldId", field_id);
   ReplaceSubstringsAfterOffset(&js, 0, "$FieldValue", field_value);
   ExecuteJsInSigninFrame(js);
 }
 
 }  // namespace chromeos