Index: chrome/browser/chromeos/login/oobe_localization_browsertest.cc |
diff --git a/chrome/browser/chromeos/login/oobe_localization_browsertest.cc b/chrome/browser/chromeos/login/oobe_localization_browsertest.cc |
index 2ceaa0c3eabe14213949dbd67b366feb3be4b84b..565af316523284b769cac55e1409378afa263ee0 100644 |
--- a/chrome/browser/chromeos/login/oobe_localization_browsertest.cc |
+++ b/chrome/browser/chromeos/login/oobe_localization_browsertest.cc |
@@ -17,8 +17,9 @@ |
#include "chrome/browser/chromeos/login/login_wizard.h" |
#include "chrome/browser/chromeos/login/screens/network_screen.h" |
#include "chrome/browser/chromeos/login/test/js_checker.h" |
-#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
+#include "chrome/browser/chromeos/login/ui/login_display_host.h" |
#include "chrome/browser/chromeos/login/wizard_controller.h" |
+#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/test/base/in_process_browser_test.h" |
#include "chromeos/system/fake_statistics_provider.h" |
@@ -154,8 +155,7 @@ class OobeLocalizationTest |
void RunLocalizationTest(); |
void WaitUntilJSIsReady() { |
- LoginDisplayHostImpl* host = static_cast<LoginDisplayHostImpl*>( |
- LoginDisplayHostImpl::default_host()); |
+ LoginDisplayHost* host = LoginDisplayHost::default_host(); |
if (!host) |
return; |
chromeos::OobeUI* oobe_ui = host->GetOobeUI(); |
@@ -325,17 +325,16 @@ void OobeLocalizationTest::RunLocalizationTest() { |
first_language.c_str()); |
ASSERT_TRUE(content::ExecuteScriptAndExtractBool( |
- static_cast<chromeos::LoginDisplayHostImpl*>( |
- chromeos::LoginDisplayHostImpl::default_host()) |
+ chromeos::LoginDisplayHost::default_host() |
achuithb
2016/01/21 23:14:31
Drop chromeos:: here and below
jdufault
2016/01/22 21:14:11
Done.
|
->GetOobeUI() |
->web_ui() |
->GetWebContents(), |
- waiting_script, |
- &done)); |
+ waiting_script, &done)); |
- checker.set_web_contents(static_cast<chromeos::LoginDisplayHostImpl*>( |
- chromeos::LoginDisplayHostImpl::default_host())-> |
- GetOobeUI()->web_ui()->GetWebContents()); |
+ checker.set_web_contents(chromeos::LoginDisplayHost::default_host() |
+ ->GetOobeUI() |
+ ->web_ui() |
+ ->GetWebContents()); |
if (!VerifyInitialOptions(kLocaleSelect, expected_locale.c_str(), true)) { |
LOG(ERROR) << "Actual value of " << kLocaleSelect << ":\n" |
@@ -362,7 +361,7 @@ void OobeLocalizationTest::RunLocalizationTest() { |
EXPECT_EQ(expected_keyboard_select, DumpOptions(kKeyboardSelect)); |
// Shut down the display host. |
- chromeos::LoginDisplayHostImpl::default_host()->Finalize(); |
+ chromeos::LoginDisplayHost::default_host()->Finalize(); |
base::MessageLoopForUI::current()->RunUntilIdle(); |
// Clear the locale pref so the statistics provider is pinged next time. |