| Index: chrome/browser/chromeos/login/oobe_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/oobe_browsertest.cc b/chrome/browser/chromeos/login/oobe_browsertest.cc
|
| index e566d290a69218db9c0e1891cce001ad4dfc204c..d3e06adb91e7a0a065c5422c64a1d10fc38e5a99 100644
|
| --- a/chrome/browser/chromeos/login/oobe_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/oobe_browsertest.cc
|
| @@ -42,7 +42,7 @@ class OobeTest : public OobeBaseTest {
|
|
|
| void TearDownOnMainThread() override {
|
| // If the login display is still showing, exit gracefully.
|
| - if (LoginDisplayHostImpl::default_host()) {
|
| + if (LoginDisplayHost::default_host()) {
|
| base::MessageLoop::current()->PostTask(FROM_HERE,
|
| base::Bind(&chrome::AttemptExit));
|
| content::RunMessageLoop();
|
| @@ -51,17 +51,13 @@ class OobeTest : public OobeBaseTest {
|
| OobeBaseTest::TearDownOnMainThread();
|
| }
|
|
|
| - chromeos::WebUILoginDisplay* GetLoginDisplay() {
|
| - chromeos::ExistingUserController* controller =
|
| - chromeos::ExistingUserController::current_controller();
|
| - CHECK(controller);
|
| - return static_cast<chromeos::WebUILoginDisplay*>(
|
| - controller->login_display());
|
| + WebUILoginDisplay* GetLoginDisplay() {
|
| + return static_cast<WebUILoginDisplay*>(
|
| + ExistingUserController::current_controller()->login_display());
|
| }
|
|
|
| views::Widget* GetLoginWindowWidget() {
|
| - return static_cast<chromeos::LoginDisplayHostImpl*>(
|
| - chromeos::LoginDisplayHostImpl::default_host())
|
| + return static_cast<LoginDisplayHostImpl*>(LoginDisplayHost::default_host())
|
| ->login_window_for_test();
|
| }
|
|
|
|
|