[cros,de-hack] Get rid of singleton for the WebUILoginScreen.

chrome/browser/chromeos/login/views_login_display_host.cc

Index: chrome/browser/chromeos/login/views_login_display_host.cc
diff --git a/chrome/browser/chromeos/login/views_login_display_host.cc b/chrome/browser/chromeos/login/views_login_display_host.cc
index 48f03248e7cc2eb898c5e83a7327994a33623918..4a05a0143776c59dca41476e8426449bce542c5d 100644
--- a/chrome/browser/chromeos/login/views_login_display_host.cc
+++ b/chrome/browser/chromeos/login/views_login_display_host.cc
@@ -5,7 +5,10 @@
 #include "chrome/browser/chromeos/login/views_login_display_host.h"
 
 #include "chrome/browser/chromeos/login/views_login_display.h"
+#include "chrome/browser/chromeos/login/views_oobe_display.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
+#include "chrome/browser/chromeos/login/wizard_controller.h"
+
 
 namespace chromeos {
 
@@ -25,7 +28,7 @@ ViewsLoginDisplayHost::~ViewsLoginDisplayHost() {
 // LoginDisplayHost implementation -----------------------------------------
 
 LoginDisplay* ViewsLoginDisplayHost::CreateLoginDisplay(
-    LoginDisplay::Delegate* delegate) const {
+    LoginDisplay::Delegate* delegate) {
   chromeos::WizardAccessibilityHelper::GetInstance()->Init();
   return new ViewsLoginDisplay(delegate, background_bounds());
 }
@@ -74,4 +77,17 @@ void ViewsLoginDisplayHost::ShowBackground() {
   background_window_->Show();
 }
 
+void ViewsLoginDisplayHost::StartSignInScreen() {
+  oobe_display_.reset();
+  BaseLoginDisplayHost::StartSignInScreen();
+}
+
+WizardController* ViewsLoginDisplayHost::CreateWizardController() {
+  oobe_display_.reset(new ViewsOobeDisplay(background_bounds()));
+  WizardController* wizard_controller  =
+      new WizardController(this, oobe_display_.get());
+  oobe_display_->SetScreenObserver(wizard_controller);
+  return wizard_controller;
+}
+
 }  // namespace chromeos