Refactor loading out of ExtensionService.

chrome/browser/chromeos/accessibility_util.cc

 // Copyright (c) 2011 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/chromeos/accessibility_util.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/speech_synthesizer_client.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
+#include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/file_reader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/webui/web_ui.h"
@@ skipping 84 matching lines @@
         false, true);
 
   // Load/Unload ChromeVox
   Profile* profile = ProfileManager::GetDefaultProfile();
   ExtensionService* extension_service =
       profile->GetExtensionService();
   std::string manifest = ResourceBundle::GetSharedInstance().
       GetRawDataResource(IDR_CHROMEVOX_MANIFEST).as_string();
   FilePath path = FilePath(extension_misc::kAccessExtensionPath)
       .AppendASCII(extension_misc::kChromeVoxDirectoryName);
-  ExtensionService::ComponentExtensionInfo info(manifest, path);
   if (enabled) { // Load ChromeVox
-    extension_service->register_component_extension(info);
     const Extension* extension =
-        extension_service->LoadComponentExtension(info);
+        extension_service->component_loader()->Add(manifest, path);
 
     if (login_web_ui) {
       RenderViewHost* render_view_host =
           login_web_ui->tab_contents()->render_view_host();
       ContentScriptLoader* loader = new ContentScriptLoader(
           extension->id(), render_view_host);
 
       for (size_t i = 0; i < extension->content_scripts().size(); i++) {
         const UserScript& script = extension->content_scripts()[i];
         for (size_t j = 0; j < script.js_scripts().size(); ++j) {
           const UserScript::File &file = script.js_scripts()[j];
           ExtensionResource resource = extension->GetResource(
               file.relative_path());
           loader->AppendScript(resource);
         }
       }
       loader->Run();  // It cleans itself up when done.
     }
 
     LOG(INFO) << "ChromeVox was Loaded.";
   } else { // Unload ChromeVox
-    extension_service->UnloadComponentExtension(info);
-    extension_service->UnregisterComponentExtension(info);
+    extension_service->component_loader()->Remove(manifest);
     LOG(INFO) << "ChromeVox was Unloaded.";
   }
 }
 
 void ToggleAccessibility(WebUI* login_web_ui) {
   bool accessibility_enabled = g_browser_process &&
       g_browser_process->local_state()->GetBoolean(
           prefs::kAccessibilityEnabled);
   accessibility_enabled = !accessibility_enabled;
   EnableAccessibility(accessibility_enabled, login_web_ui);
 };
 
 void Speak(const char* speak_str, bool queue, bool interruptible) {
   if (queue || !interruptible) {
     std::string props = "";
     props.append("enqueue=");
     props.append(queue ? "1;" : "0;");
     props.append("interruptible=");
     props.append(interruptible ? "1;" : "0;");
     chromeos::DBusThreadManager::Get()->speech_synthesizer_client()->
         SetSpeakProperties(props);
   }
   chromeos::DBusThreadManager::Get()->speech_synthesizer_client()->
       Speak(speak_str);
 }
 
 
 }  // namespace accessibility
 }  // namespace chromeos