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 c9d8f6545e63007b3ac23eba25497241c0a172c2..714c075edd02bebaed6808d1e4911be134877754 100644
--- a/chrome/browser/extensions/component_loader.h
+++ b/chrome/browser/extensions/component_loader.h
@@ -99,10 +99,20 @@ class ComponentLoader {
   void Reload(const std::string& extension_id);
 
 #if defined(OS_CHROMEOS)
+  // True if a user is logged in and this isn't a guest session.
+  static bool IsNormalSession();
+
+  // Adds an extension where the manifest file is stored on the file system.
+  // |manifest_filename| can be relative to the |root_directory|.
   // 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);
+  void AddWithManifestFile(
+      const base::FilePath::CharType* manifest_filename,
+      const base::FilePath& root_directory,
+      const char* extension_id,
+      const base::Closure& done_cb);
+
   void AddChromeOsSpeechSynthesisExtension();
 #endif
 
@@ -175,14 +185,6 @@ 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|.
   // Called with a |root_directory| and parsed |manifest| and invokes
   // |done_cb| after adding the extension.