Re-land: Move ChromeVox loading out of ComponentLoader.

chrome/browser/extensions/component_loader.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_COMPONENT_LOADER_H_
 #define CHROME_BROWSER_EXTENSIONS_COMPONENT_LOADER_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 81 matching lines @@
   // Similar to above but adds the default component extensions for kiosk mode.
   void AddDefaultComponentExtensionsForKioskMode(bool skip_session_components);
 
   // Clear the list of registered extensions.
   void ClearAllRegistered();
 
   // Reloads a registered component extension.
   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.

[David Tseng, 2016/09/01 19:46:41]

nit: and that the manifest file lives in |root_directory|. TTS and ChromeVox are
the only .ones where that's true

[dmazzoni, 2016/09/07 19:05:03]

Done

+  // 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
 
   void set_ignore_whitelist_for_testing(bool value) {
     ignore_whitelist_for_testing_ = value;
   }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ComponentLoaderTest, ParseManifest);
 
@@ skipping 52 matching lines @@
   scoped_refptr<const Extension> CreateExtension(
       const ComponentExtensionInfo& info, std::string* utf8_error);
 
   // Unloads |component| from the memory.
   void UnloadComponent(ComponentExtensionInfo* component);
 
   // Enable HTML5 FileSystem for given component extension in Guest mode.
   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,
       std::unique_ptr<base::DictionaryValue> manifest);
 #endif
 
   PrefService* profile_prefs_;
   PrefService* local_state_;
   Profile* profile_;
 
   ExtensionServiceInterface* extension_service_;
 
   // List of registered component extensions (see Manifest::Location).
   typedef std::vector<ComponentExtensionInfo> RegisteredComponentExtensions;
   RegisteredComponentExtensions component_extensions_;
 
   bool ignore_whitelist_for_testing_;
 
   base::WeakPtrFactory<ComponentLoader> weak_factory_;
 
   friend class TtsApiTest;
 
   DISALLOW_COPY_AND_ASSIGN(ComponentLoader);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_COMPONENT_LOADER_H_