Merge WebUILoginDisplayHost into LoginDisplayHostImpl

chrome/browser/automation/automation_util.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/automation_util.h"
 
 #include <string>
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 29 matching lines @@
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_constants.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 #if defined(OS_CHROMEOS)
 #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/webui_login_display.h"
-#include "chrome/browser/chromeos/login/webui_login_display_host.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #endif
 
 using content::BrowserThread;
 using content::RenderViewHost;
 using content::WebContents;
 
 #if defined(OS_CHROMEOS)
 using chromeos::ExistingUserController;
 using chromeos::User;
@@ skipping 117 matching lines @@
     *error_message = "No user manager.";
     return NULL;
   }
   if (!user_manager->IsUserLoggedIn()) {
     ExistingUserController* controller =
         ExistingUserController::current_controller();
     if (!controller) {
       *error_message = "Cannot get controller though user is not logged in.";
       return NULL;
     }
-    chromeos::WebUILoginDisplayHost* webui_login_display_host =
-        static_cast<chromeos::WebUILoginDisplayHost*>(
+    chromeos::LoginDisplayHostImpl* webui_host =
+        static_cast<chromeos::LoginDisplayHostImpl*>(
             controller->login_display_host());
-    content::WebUI* web_ui = webui_login_display_host->GetOobeUI()->web_ui();
+    content::WebUI* web_ui = webui_host->GetOobeUI()->web_ui();
     if (!web_ui) {
       *error_message = "Unable to get webui from login display host.";
       return NULL;
     }
     return Profile::FromWebUI(web_ui);
   } else {
     ash::Shell* shell = ash::Shell::GetInstance();
     if (!shell || !shell->delegate()) {
       *error_message = "Unable to get shell delegate.";
       return NULL;
@@ skipping 430 matching lines @@
       const extensions::Extension* extension;
       return GetExtensionForId(id, profile, &extension);
     }
     default:
       break;
   }
   return false;
 }
 
 }  // namespace automation_util