| 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 ebfe728a82e8283518f6fcf1afd62d21dcff64c0..ca92eb66545285a8d528341c40b89f48d1b2a39f 100644
|
| --- a/chrome/browser/chromeos/login/test/oobe_base_test.cc
|
| +++ b/chrome/browser/chromeos/login/test/oobe_base_test.cc
|
| @@ -15,6 +15,7 @@
|
| #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/chromeos/login/gaia_screen_handler.h"
|
| #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/chrome_switches.h"
|
| @@ -195,6 +196,14 @@ base::Closure OobeBaseTest::SimulateNetworkPortalClosure() {
|
| base::Unretained(this));
|
| }
|
|
|
| +void OobeBaseTest::DisableRestrictiveProxyCheck() {
|
| + static_cast<chromeos::LoginDisplayHostImpl*>(
|
| + chromeos::LoginDisplayHostImpl::default_host())
|
| + ->GetOobeUI()
|
| + ->GetGaiaScreenActor()
|
| + ->DisableRestrictiveProxyCheck();
|
| +}
|
| +
|
| void OobeBaseTest::JsExpect(const std::string& expression) {
|
| JS().ExpectTrue(expression);
|
| }
|
| @@ -214,7 +223,10 @@ WebUILoginDisplay* OobeBaseTest::GetLoginDisplay() {
|
|
|
| void OobeBaseTest::WaitForGaiaPageLoad() {
|
| WaitForSigninScreen();
|
| + WaitForGaiaPageReload();
|
| +}
|
|
|
| +void OobeBaseTest::WaitForGaiaPageReload() {
|
| JS().Evaluate(
|
| "$('gaia-signin').gaiaAuthHost_.addEventListener('ready',"
|
| "function() {"
|
|
|