Index: chrome/browser/chromeos/login/test/oobe_base_test.cc |
diff --git a/chrome/browser/chromeos/login/test/oobe_base_test.cc b/chrome/browser/chromeos/login/test/oobe_base_test.cc |
index dd823a8db380989b0e651446038e8f7d09debe52..9db1ab2c266d6abd64017d99723c5eb962542aea 100644 |
--- a/chrome/browser/chromeos/login/test/oobe_base_test.cc |
+++ b/chrome/browser/chromeos/login/test/oobe_base_test.cc |
@@ -11,6 +11,7 @@ |
#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" |
@@ -126,6 +127,9 @@ void OobeBaseTest::SetUpOnMainThread() { |
chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE, |
content::NotificationService::AllSources())); |
+ js_checker_.set_web_contents(LoginDisplayHostImpl::default_host() |
+ ->GetWebUILoginView() |
+ ->GetWebContents()); |
ExtensionApiTest::SetUpOnMainThread(); |
} |
@@ -212,12 +216,7 @@ base::Closure OobeBaseTest::SimulateNetworkPortalClosure() { |
} |
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() { |