Re-land: Move ChromeVox loading out of ComponentLoader.

chrome/browser/extensions/component_loader.h

Index: chrome/browser/extensions/component_loader.h
diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h
index a09441cdf24dacacd2cb64c6f6028f52b97c2e7a..0d34bef8b90e7bd8f33b9140d422332c4ad247f1 100644
--- a/chrome/browser/extensions/component_loader.h
+++ b/chrome/browser/extensions/component_loader.h
@@ -99,10 +99,15 @@ class ComponentLoader {
   void Reload(const std::string& extension_id);
 
 #if defined(OS_CHROMEOS)
-  // Calls |done_cb|, if not a null callback, on success.
-  // NOTE: |done_cb| is not called if the component loader is shut down
-  // during loading.
-  void AddChromeVoxExtension(const base::Closure& done_cb);
+  // Add a component extension from a specific directory. Assumes that the
+  // extension uses a different manifest file when this is a guest session
+  // and that the manifest file lives in |root_directory|. Calls |done_cb|
+  // on success, unless the component loader is shut down during loading.
+  void AddComponentFromDir(
+      const base::FilePath& root_directory,
+      const char* extension_id,
+      const base::Closure& done_cb);
+
   void AddChromeOsSpeechSynthesisExtension();
 #endif
 
@@ -175,18 +180,10 @@ class ComponentLoader {
   void EnableFileSystemInGuestMode(const std::string& id);
 
 #if defined(OS_CHROMEOS)
-  // Adds an extension where the manifest file is stored on the file system.
-  // |manifest_filename| can be relative to the |root_directory|.
-  void AddWithManifestFile(
-      const base::FilePath::CharType* manifest_filename,
-      const base::FilePath& root_directory,
-      const char* extension_id,
-      const base::Closure& done_cb);
-
-  // Used as a reply callback by |AddWithManifestFile|.
+  // Used as a reply callback by |AddComponentFromDir|.
   // Called with a |root_directory| and parsed |manifest| and invokes
   // |done_cb| after adding the extension.
-  void FinishAddWithManifestFile(
+  void FinishAddComponentFromDir(
       const base::FilePath& root_directory,
       const char* extension_id,
       const base::Closure& done_cb,