Refactor loading out of ExtensionService.

chrome/browser/automation/automation_provider.cc

Index: chrome/browser/automation/automation_provider.cc
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index ad54bc716159e146bf85f3b88392e851877288ca..c0a193627341822c54843b7d8e636ccac34ca1ef 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -50,6 +50,7 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
+#include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -863,7 +864,10 @@ void AutomationProvider::InstallExtension(
       installer->set_install_cause(extension_misc::INSTALL_CAUSE_AUTOMATION);
       installer->InstallCrx(extension_path);
     } else {
-      service->LoadExtension(extension_path, with_ui);
+      scoped_refptr<UnpackedInstaller> installer(
+          service->MakeUnpackedInstaller());
+      installer->set_prompt_for_plugins(with_ui);

[Aaron Boodman, 2011/10/28 22:21:58]

fff I think this might be the only caller who wants UI in this path. It doesn't
seem worth supporting just for tests (which I think is all this is used for).

[Yoyo Zhou, 2011/10/31 21:58:15]

This is actually for maybe disabling the UI. (See the comment there, and/or
Matt's comment.) I haven't really looked yet, but I assume having to deal with a
UI prompt in your test is annoying.

[Aaron Boodman, 2011/10/31 22:33:25]

Yeah, after seeing Matt's comments and the related bug report, I understand. And
I agree that fixing this is out of scope for your CL.

+      installer->Load(extension_path);
     }
   } else {
     AutomationMsg_InstallExtension::WriteReplyParams(reply_message, 0);