Merge WebUILoginDisplayHost into LoginDisplayHostImpl

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 152 matching lines @@
 }
 
 WizardController::~WizardController() {
   if (default_controller_ == this) {
     default_controller_ = NULL;
   } else {
     NOTREACHED() << "More than one controller are alive.";
   }
 }
 
-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) {
     is_out_of_box_ = true;
   }
 
   AdvanceToScreen(first_screen_name);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_WIZARD_FIRST_SCREEN_SHOWN,
       content::NotificationService::AllSources(),
@@ skipping 573 matching lines @@
   return zero_delay_enabled_;
 }
 
 // static
 void WizardController::SetZeroDelays() {
   kShowDelayMs = 0;
   zero_delay_enabled_ = true;
 }
 
 }  // namespace chromeos