Merge WebUILoginDisplayHost into LoginDisplayHostImpl

chrome/browser/automation/testing_automation_provider_chromeos.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/automation/testing_automation_provider.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/command_line.h"
 #include "base/i18n/time_formatting.h"
 #include "base/prefs/pref_service.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/automation/automation_provider_observers.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/login_display.h"
-#include "chrome/browser/chromeos/login/login_display_host.h"
+#include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
 #include "chrome/browser/chromeos/login/screens/network_screen.h"
 #include "chrome/browser/chromeos/login/screens/update_screen.h"
 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
-#include "chrome/browser/chromeos/login/webui_login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/pref_names.h"
@@ skipping 1107 matching lines @@
         "User is already logged in.");
     return;
   }
   ExistingUserController* controller =
       ExistingUserController::current_controller();
   if (!controller) {
     AutomationJSONReply(this, reply_message).SendError(
         "Unable to access ExistingUserController");
     return;
   }
-  chromeos::WebUILoginDisplayHost* webui_login_display_host =
-      static_cast<chromeos::WebUILoginDisplayHost*>(
+  chromeos::LoginDisplayHostImpl* webui_host =
+      static_cast<chromeos::LoginDisplayHostImpl*>(
           controller->login_display_host());
   content::WebContents* web_contents =
-      webui_login_display_host->GetOobeUI()->web_ui()->GetWebContents();
+      webui_host->GetOobeUI()->web_ui()->GetWebContents();
 
   new DomOperationMessageSender(this, reply_message, true);
   ExecuteJavascriptInRenderViewFrame(ASCIIToUTF16(frame_xpath),
                                      ASCIIToUTF16(javascript),
                                      reply_message,
                                      web_contents->GetRenderViewHost());
 }
 
 void TestingAutomationProvider::EnableSpokenFeedback(
     DictionaryValue* args, IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   bool enabled;
   if (!args->GetBoolean("enabled", &enabled)) {
     reply.SendError("Invalid or missing args.");
     return;
   }
   const UserManager* user_manager = UserManager::Get();
   if (!user_manager) {
     reply.SendError("No user manager!");
     return;
   }
 
   if (user_manager->IsUserLoggedIn()) {
     chromeos::accessibility::EnableSpokenFeedback(
         enabled, NULL, ash::A11Y_NOTIFICATION_NONE);
   } else {
     ExistingUserController* controller =
         ExistingUserController::current_controller();
-    chromeos::WebUILoginDisplayHost* webui_login_display_host =
-        static_cast<chromeos::WebUILoginDisplayHost*>(
+    chromeos::LoginDisplayHostImpl* webui_host =
+        static_cast<chromeos::LoginDisplayHostImpl*>(
             controller->login_display_host());
     chromeos::accessibility::EnableSpokenFeedback(
         enabled,
-        webui_login_display_host->GetOobeUI()->web_ui(),
+        webui_host->GetOobeUI()->web_ui(),
         ash::A11Y_NOTIFICATION_NONE);
   }
 
   reply.SendSuccess(return_value.get());
 }
 
 void TestingAutomationProvider::IsSpokenFeedbackEnabled(
     DictionaryValue* args, IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
@@ skipping 127 matching lines @@
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       AddObserver(power_manager_observer_);
 }
 
 void TestingAutomationProvider::RemoveChromeosObservers() {
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
       RemoveObserver(power_manager_observer_);
   delete power_manager_observer_;
   power_manager_observer_ = NULL;
 }