| Index: chrome/browser/extensions/component_loader.h
|
| diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h
|
| index 4904e1cb26477da5d9e4592f9ba82e1b78c3297b..77d5c1740b0a4c2a5f36cfd60a6a08d20743d558 100644
|
| --- a/chrome/browser/extensions/component_loader.h
|
| +++ b/chrome/browser/extensions/component_loader.h
|
| @@ -65,6 +65,10 @@ class ComponentLoader {
|
| void Remove(const FilePath& root_directory);
|
| void Remove(const std::string& id);
|
|
|
| + // Call this during test setup to load component extensions that have
|
| + // background pages for testing, which could otherwise interfere with tests.
|
| + static void EnableBackgroundExtensionsForTesting();
|
| +
|
| // Adds the default component extensions.
|
| void AddDefaultComponentExtensions();
|
|
|
| @@ -109,6 +113,7 @@ class ComponentLoader {
|
| // Loads a registered component extension.
|
| const Extension* Load(const ComponentExtensionInfo& info);
|
|
|
| + void AddDefaultComponentExtensionsWithBackgroundPages();
|
| void AddFileManagerExtension();
|
|
|
| #if defined(OS_CHROMEOS)
|
|
|