Migrate call sites LoginDisplayHostImpl::default_host to LoginDisplayHost.

chrome/browser/chromeos/login/kiosk_browsertest.cc

 // Copyright (c) 2013 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 <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/shell.h"
 #include "base/bind.h"
@@ skipping 661 matching lines @@
 
     // App should appear with its window.
     extensions::AppWindowRegistry* app_window_registry =
         extensions::AppWindowRegistry::Get(app_profile);
     extensions::AppWindow* window =
         AppWindowWaiter(app_window_registry, test_app_id_).Wait();
     EXPECT_TRUE(window);
 
     // Login screen should be gone or fading out.
     chromeos::LoginDisplayHost* login_display_host =
-        chromeos::LoginDisplayHostImpl::default_host();
+        chromeos::LoginDisplayHost::default_host();
     EXPECT_TRUE(
         login_display_host == NULL ||
         login_display_host->GetNativeWindow()->layer()->GetTargetOpacity() ==
             0.0f);
 
     // Terminate the app.
     if (terminate_app)
       window->GetBaseWindow()->Close();
 
     // Wait until the app terminates if it is still running.
@@ skipping 66 matching lines @@
     // Start app launch and wait for network connectivity timeout.
     StartAppLaunchFromLoginScreen(SimulateNetworkOfflineClosure());
     OobeScreenWaiter splash_waiter(OobeDisplay::SCREEN_APP_LAUNCH_SPLASH);
     splash_waiter.Wait();
     WaitForAppLaunchNetworkTimeout();
 
     // Configure network link should be visible.
     JsExpect("$('splash-config-network').hidden == false");
 
     // Set up fake user manager with an owner for the test.
-    static_cast<LoginDisplayHostImpl*>(LoginDisplayHostImpl::default_host())
-        ->GetOobeUI()->ShowOobeUI(false);
+    LoginDisplayHost::default_host()->GetOobeUI()->ShowOobeUI(false);
 
     // Configure network should bring up lock screen for owner.
     OobeScreenWaiter lock_screen_waiter(OobeDisplay::SCREEN_ACCOUNT_PICKER);
     static_cast<AppLaunchSplashScreenActor::Delegate*>(GetAppLaunchController())
         ->OnConfigureNetwork();
     lock_screen_waiter.Wait();
 
     // There should be only one owner pod on this screen.
     JsExpect("$('pod-row').alwaysFocusSinglePod");
 
     // A network error screen should be shown after authenticating.
     OobeScreenWaiter error_screen_waiter(OobeDisplay::SCREEN_ERROR_MESSAGE);
     static_cast<AppLaunchSigninScreen::Delegate*>(GetAppLaunchController())
         ->OnOwnerSigninSuccess();
     error_screen_waiter.Wait();
 
     ASSERT_TRUE(GetAppLaunchController()->showing_network_dialog());
 
     SimulateNetworkOnline();
     WaitForAppLaunchSuccess();
   }
 
   AppLaunchController* GetAppLaunchController() {
-    return chromeos::LoginDisplayHostImpl::default_host()
-        ->GetAppLaunchController();
+    return chromeos::LoginDisplayHost::default_host()->GetAppLaunchController();

[achuithb, 2016/01/21 23:14:31]

Drop chromeos:: here and below

[jdufault, 2016/01/22 21:14:11]

Done.

   }
 
   // Returns a lock that is holding a task on the FILE thread. Any tasks posted
   // to the FILE thread after this call will be blocked until the returned
   // lock is released.
   // This can be used to prevent app installation from completing until some
   // other conditions are checked and triggered. For example, this can be used
   // to trigger the network screen during app launch without racing with the
   // app launching process itself.
   scoped_ptr<base::AutoLock> LockFileThread() {
@@ skipping 424 matching lines @@
   GetLoginUI()->CallJavascriptFunction(
       "login.KioskEnableScreen.enableKioskForTesting",
       base::FundamentalValue(false));
 
   // Wait for the kiosk_enable screen to disappear.
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_KIOSK_ENABLE_WARNING_COMPLETED,
       content::NotificationService::AllSources()).Wait();
 
   // Show signin screen again.
-  chromeos::LoginDisplayHostImpl::default_host()->StartSignInScreen(
+  chromeos::LoginDisplayHost::default_host()->StartSignInScreen(
       LoginScreenContext());
   OobeScreenWaiter(OobeDisplay::SCREEN_GAIA_SIGNIN).Wait();
 
   // Show kiosk enable screen again.
   GetLoginUI()->CallJavascriptFunction("cr.ui.Oobe.handleAccelerator",
                                        base::StringValue("kiosk_enable"));
 
   // And it should show up.
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_KIOSK_ENABLE_WARNING_VISIBLE,
@@ skipping 69 matching lines @@
   PrepareAppLaunch();
   SimulateNetworkOnline();
 
   // Make cros settings untrusted.
   settings_helper_.SetTrustedStatus(
       CrosSettingsProvider::PERMANENTLY_UNTRUSTED);
 
   // Trigger the code that handles auto-launch on enterprise devices. This would
   // normally be called from ShowLoginWizard(), which runs so early that it is
   // not possible to inject an auto-launch policy before it runs.
-  LoginDisplayHost* login_display_host = LoginDisplayHostImpl::default_host();
+  LoginDisplayHost* login_display_host = LoginDisplayHost::default_host();
   ASSERT_TRUE(login_display_host);
   login_display_host->StartAppLaunch(test_app_id(), false, true);
 
   // Check that no launch has started.
   EXPECT_FALSE(login_display_host->GetAppLaunchController());
 }
 
 class KioskUpdateTest : public KioskTest {
  public:
   KioskUpdateTest() {}
@@ skipping 974 matching lines @@
   content::WindowedNotificationObserver(
       chrome::NOTIFICATION_KIOSK_AUTOLAUNCH_WARNING_VISIBLE,
       content::NotificationService::AllSources()).Wait();
 
   // Wait for the wallpaper to load.
   WaitForWallpaper();
   EXPECT_TRUE(wallpaper_loaded());
 }
 
 }  // namespace chromeos