Index: chrome/browser/extensions/test_extension_system.cc |
diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc |
index b1159040ab7656dec57e1b17f75ee4ddc7fd4677..b1cbb8723755597b8e89d66291b9b7d4a41e4998 100644 |
--- a/chrome/browser/extensions/test_extension_system.cc |
+++ b/chrome/browser/extensions/test_extension_system.cc |
@@ -12,7 +12,6 @@ |
#include "chrome/browser/extensions/install_verifier.h" |
#include "chrome/browser/extensions/shared_module_service.h" |
#include "chrome/browser/extensions/standard_management_policy_provider.h" |
-#include "chrome/browser/extensions/user_script_master.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/common/chrome_switches.h" |
#include "content/public/browser/browser_thread.h" |
@@ -131,7 +130,7 @@ void TestExtensionSystem::SetExtensionService(ExtensionService* service) { |
extension_service_.reset(service); |
} |
-UserScriptMaster* TestExtensionSystem::user_script_master() { |
+SharedUserScriptMaster* TestExtensionSystem::shared_user_script_master() { |
return NULL; |
} |
@@ -194,6 +193,12 @@ scoped_ptr<ExtensionSet> TestExtensionSystem::GetDependentExtensions( |
extension); |
} |
+DeclarativeUserScriptMaster* |
+TestExtensionSystem::GetDeclarativeUserScriptMasterByExtension( |
+ const ExtensionId& extension_id) { |
+ return NULL; |
+} |
+ |
// static |
KeyedService* TestExtensionSystem::Build(content::BrowserContext* profile) { |
return new TestExtensionSystem(static_cast<Profile*>(profile)); |