Merge WebUILoginDisplayHost into LoginDisplayHostImpl

chrome/browser/chromeos/login/wizard_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 63 matching lines @@
   // If true zero delays have been enabled (for browser tests).
   static bool IsZeroDelayEnabled();
 
   // Skips any screens that may normally be shown after login (registration,
   // Terms of Service, user image selection).
   static void SkipPostLoginScreensForTesting();
 
   // Shows the first screen defined by |first_screen_name| or by default
   // if the parameter is empty. Takes ownership of |screen_parameters|.
   void Init(const std::string& first_screen_name,
-            base::DictionaryValue* screen_parameters);
+            scoped_ptr<base::DictionaryValue> screen_parameters);
 
   // Advances to screen defined by |screen_name| and shows it.
   void AdvanceToScreen(const std::string& screen_name);
 
   // Advances to screen defined by |screen_name| and shows it.
   // Takes ownership of |screen_parameters|.
   void AdvanceToScreenWithParams(const std::string& first_screen_name,
                                  base::DictionaryValue* screen_parameters);
 
   // Advances to login screen. Should be used in for testing only.
@@ skipping 196 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(WizardControllerFlowTest, Accelerators);
   friend class WizardControllerFlowTest;
   friend class WizardInProcessBrowserTest;
 
   DISALLOW_COPY_AND_ASSIGN(WizardController);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_WIZARD_CONTROLLER_H_