Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / test_extension_system.cc

diff --git a/src/chrome/browser/extensions/test_extension_system.cc b/src/chrome/browser/extensions/test_extension_system.cc
index 9a8a3be..b1cbb87 100644 (file)
--- a/src/chrome/browser/extensions/test_extension_system.cc
+++ b/src/chrome/browser/extensions/test_extension_system.cc
@@ -12,8 +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/state_store.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"
@@ -30,6 +28,7 @@
 #include "extensions/browser/process_manager.h"
 #include "extensions/browser/quota_service.h"
 #include "extensions/browser/runtime_data.h"
+#include "extensions/browser/state_store.h"
 #include "extensions/browser/value_store/testing_value_store.h"
 
 using content::BrowserThread;
@@ -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));