Refactoring ExtenionInstallUI to abstract the Browser references.

chrome/browser/automation/testing_automation_provider.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 <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 3883 matching lines @@
   reply.SendSuccess(NULL);
 }
 
 // Sample json input: { "command": "GetThemeInfo" }
 // Refer GetThemeInfo() in chrome/test/pyautolib/pyauto.py for sample output.
 void TestingAutomationProvider::GetThemeInfo(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
-  const Extension* theme = ThemeServiceFactory::GetThemeForProfile(profile());
+  const Extension* theme =

[Yoyo Zhou, 2012/05/23 23:17:49]

nit: This change looks spurious.

[Jay Civelli, 2012/05/30 20:20:35]

Done.

+      ThemeServiceFactory::GetThemeForProfile(profile());
   if (theme) {
     return_value->SetString("name", theme->name());
     return_value->Set("images", theme->GetThemeImages()->DeepCopy());
     return_value->Set("colors", theme->GetThemeColors()->DeepCopy());
     return_value->Set("tints", theme->GetThemeTints()->DeepCopy());
   }
   AutomationJSONReply(this, reply_message).SendSuccess(return_value.get());
 }
 
 void TestingAutomationProvider::InstallExtension(
@@ skipping 24 matching lines @@
     new ExtensionReadyNotificationObserver(
         manager,
         service,
         this,
         reply_message);
 
     FilePath extension_path(path_string);
     // If the given path has a 'crx' extension, assume it is a packed extension
     // and install it. Otherwise load it as an unpacked extension.
     if (extension_path.MatchesExtension(FILE_PATH_LITERAL(".crx"))) {
-      ExtensionInstallUI* client =
-          (with_ui ? new ExtensionInstallUI(browser->profile()) : NULL);
+      ExtensionInstallPrompt* client =
+          (with_ui ? new ExtensionInstallPrompt(browser->profile()) : NULL);
       scoped_refptr<CrxInstaller> installer(
           CrxInstaller::Create(service, client));
       if (!with_ui)
         installer->set_allow_silent_install(true);
       installer->set_install_cause(extension_misc::INSTALL_CAUSE_AUTOMATION);
       installer->InstallCrx(extension_path);
     } else {
       scoped_refptr<extensions::UnpackedInstaller> installer(
           extensions::UnpackedInstaller::Create(service));
       installer->set_prompt_for_plugins(with_ui);
@@ skipping 2609 matching lines @@
 
 void TestingAutomationProvider::WaitForProcessLauncherThreadToGoIdle(
     IPC::Message* reply_message) {
   new WaitForProcessLauncherThreadToGoIdleObserver(this, reply_message);
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }