Migrate call sites LoginDisplayHostImpl::default_host to LoginDisplayHost.

chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc

 // Copyright 2014 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 "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "chrome/browser/chromeos/login/screens/network_error_view.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.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/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/fake_shill_manager_client.h"
 #include "chromeos/network/portal_detector/network_portal_detector.h"
 
 namespace chromeos {
 
 namespace {
@@ skipping 46 matching lines @@
     ASSERT_EQ(is_shown, actual_is_shown);
     ASSERT_EQ(num_portal_notifications, delegate_.num_portal_notifications());
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
     command_line->AppendSwitch(chromeos::switches::kLoginManager);
   }
 
   void SetUpOnMainThread() override {
-    host_ = LoginDisplayHostImpl::default_host();
-    CHECK(host_);
+    host_ = LoginDisplayHost::default_host();
     content::WebContents* web_contents =
-        LoginDisplayHostImpl::default_host()->GetWebUILoginView()->
-            GetWebContents();
+        host_->GetWebUILoginView()->GetWebContents();
     captive_portal_window_proxy_.reset(
         new CaptivePortalWindowProxy(&delegate_, web_contents));
   }
 
   void TearDownOnMainThread() override {
     captive_portal_window_proxy_.reset();
     base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_);
     base::MessageLoopForUI::current()->RunUntilIdle();
   }
 
@@ skipping 109 matching lines @@
   NetworkPortalDetectorTestImpl* network_portal_detector_;
 
   DISALLOW_COPY_AND_ASSIGN(CaptivePortalWindowCtorDtorTest);
 };
 
 IN_PROC_BROWSER_TEST_F(CaptivePortalWindowCtorDtorTest, PRE_OpenPortalDialog) {
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(CaptivePortalWindowCtorDtorTest, OpenPortalDialog) {
-  LoginDisplayHostImpl* host =
-      static_cast<LoginDisplayHostImpl*>(LoginDisplayHostImpl::default_host());
+  LoginDisplayHost* host = LoginDisplayHost::default_host();
   ASSERT_TRUE(host);
   OobeUI* oobe = host->GetOobeUI();
   ASSERT_TRUE(oobe);
 
   // Error screen asks portal detector to change detection strategy.
   ErrorScreen* error_screen = oobe->GetErrorScreen();
   ASSERT_TRUE(error_screen);
 
   ASSERT_EQ(PortalDetectorStrategy::STRATEGY_ID_LOGIN_SCREEN, strategy_id());
   network_portal_detector()->NotifyObserversForTesting();
   OobeScreenWaiter(OobeDisplay::SCREEN_ERROR_MESSAGE).Wait();
   ASSERT_EQ(PortalDetectorStrategy::STRATEGY_ID_ERROR_SCREEN, strategy_id());
 
   error_screen->ShowCaptivePortal();
 }
 
 }  // namespace chromeos