Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / content_settings / content_settings_api.cc

diff --git a/src/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/src/chrome/browser/extensions/api/content_settings/content_settings_api.cc
index 9dfe012..d9d174c 100644 (file)
--- a/src/chrome/browser/extensions/api/content_settings/content_settings_api.cc
+++ b/src/chrome/browser/extensions/api/content_settings/content_settings_api.cc
@@ -12,9 +12,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
-#include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_api_constants.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h"
+#include "chrome/browser/extensions/api/content_settings/content_settings_service.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_store.h"
 #include "chrome/browser/extensions/api/preference/preference_api_constants.h"
 #include "chrome/browser/extensions/api/preference/preference_helpers.h"
@@ -23,8 +23,9 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/content_settings.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/plugin_service.h"
-#include "extensions/browser/extension_prefs.h"
+#include "extensions/browser/extension_prefs_scope.h"
 #include "extensions/common/error_utils.h"
 
 using content::BrowserThread;
@@ -59,7 +60,7 @@ namespace extensions {
 namespace helpers = content_settings_helpers;
 namespace keys = content_settings_api_constants;
 
-bool ContentSettingsContentSettingClearFunction::RunImpl() {
+bool ContentSettingsContentSettingClearFunction::RunSync() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
 
@@ -86,14 +87,14 @@ bool ContentSettingsContentSettingClearFunction::RunImpl() {
     }
   }
 
-  ContentSettingsStore* store =
-      ExtensionPrefs::Get(GetProfile())->content_settings_store();
+  scoped_refptr<ContentSettingsStore> store =
+      ContentSettingsService::Get(GetProfile())->content_settings_store();
   store->ClearContentSettingsForExtension(extension_id(), scope);
 
   return true;
 }
 
-bool ContentSettingsContentSettingGetFunction::RunImpl() {
+bool ContentSettingsContentSettingGetFunction::RunSync() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
 
@@ -167,7 +168,7 @@ bool ContentSettingsContentSettingGetFunction::RunImpl() {
   return true;
 }
 
-bool ContentSettingsContentSettingSetFunction::RunImpl() {
+bool ContentSettingsContentSettingSetFunction::RunSync() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
 
@@ -237,15 +238,15 @@ bool ContentSettingsContentSettingSetFunction::RunImpl() {
     return false;
   }
 
-  ContentSettingsStore* store =
-      ExtensionPrefs::Get(GetProfile())->content_settings_store();
+  scoped_refptr<ContentSettingsStore> store =
+      ContentSettingsService::Get(GetProfile())->content_settings_store();
   store->SetExtensionContentSetting(extension_id(), primary_pattern,
                                     secondary_pattern, content_type,
                                     resource_identifier, setting, scope);
   return true;
 }
 
-bool ContentSettingsContentSettingGetResourceIdentifiersFunction::RunImpl() {
+bool ContentSettingsContentSettingGetResourceIdentifiersFunction::RunAsync() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));