Move default_host from LoginDisplayHostImpl to LoginDisplayHost.

chrome/browser/chromeos/login/ui/login_display_host_impl.h

Index: chrome/browser/chromeos/login/ui/login_display_host_impl.h
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.h b/chrome/browser/chromeos/login/ui/login_display_host_impl.h
index fc12ce629ad07fd7527a665554eca2bede4d922c..aa5988b262fec55d6e74fc33e8dead781aa25396 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.h
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.h
@@ -46,7 +46,6 @@ namespace chromeos {
 class DemoAppLauncher;
 class FocusRingController;
 class KeyboardDrivenOobeKeyHandler;
-class OobeUI;
 class WebUILoginDisplay;
 class WebUILoginView;
 
@@ -65,14 +64,10 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
   explicit LoginDisplayHostImpl(const gfx::Rect& background_bounds);
   ~LoginDisplayHostImpl() override;
 
-  // Returns the default LoginDisplayHost instance if it has been created.
-  static LoginDisplayHost* default_host() {
-    return default_host_;
-  }
-
   // LoginDisplayHost implementation:
   LoginDisplay* CreateLoginDisplay(LoginDisplay::Delegate* delegate) override;
   gfx::NativeWindow GetNativeWindow() const override;
+  OobeUI* GetOobeUI() const override;
   WebUILoginView* GetWebUILoginView() const override;
   void BeforeSessionStart() override;
   void Finalize() override;
@@ -99,9 +94,6 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
   // Called when the first browser window is created, but before it's shown.
   void OnBrowserCreated();
 
-  // Returns instance of the OOBE WebUI.
-  OobeUI* GetOobeUI() const;
-
   const gfx::Rect& background_bounds() const { return background_bounds_; }
 
   // Trace id for ShowLoginWebUI event (since there exists at most one login
@@ -207,9 +199,6 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
 
   content::NotificationRegistrar registrar_;
 
-  // Default LoginDisplayHost.
-  static LoginDisplayHost* default_host_;
-
   // The controller driving the auto-enrollment check.
   scoped_ptr<AutoEnrollmentController> auto_enrollment_controller_;