Merge WebUILoginDisplayHost into LoginDisplayHostImpl

chrome/browser/chromeos/login/wizard_controller.cc

Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index e5c1417e364ab0f3a14a7e3ad248ed251885672c..deced1fe97a3ec0120af8068fbeaae230265b45f 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -170,11 +170,12 @@ WizardController::~WizardController() {
   }
 }
 
-void WizardController::Init(const std::string& first_screen_name,
-                            base::DictionaryValue* screen_parameters) {
+void WizardController::Init(
+    const std::string& first_screen_name,
+    scoped_ptr<base::DictionaryValue> screen_parameters) {
   VLOG(1) << "Starting OOBE wizard with screen: " << first_screen_name;
   first_screen_name_ = first_screen_name;
-  screen_parameters_.reset(screen_parameters);
+  screen_parameters_ = screen_parameters.Pass();
 
   bool oobe_complete = StartupUtils::IsOobeCompleted();
   if (!oobe_complete || first_screen_name == kOutOfBoxScreenName) {