Index: chrome/browser/extensions/api/content_settings/content_settings_store.cc |
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store.cc b/chrome/browser/extensions/api/content_settings/content_settings_store.cc |
index aeab4cc6bb5249723cef94a387390bf1ff84487c..050dd7edd03b3703270aa2dc473d60bb6e8f1d52 100644 |
--- a/chrome/browser/extensions/api/content_settings/content_settings_store.cc |
+++ b/chrome/browser/extensions/api/content_settings/content_settings_store.cc |
@@ -19,6 +19,7 @@ |
#include "components/content_settings/core/browser/content_settings_origin_identifier_value_map.h" |
#include "components/content_settings/core/browser/content_settings_rule.h" |
#include "components/content_settings/core/browser/content_settings_utils.h" |
+#include "components/content_settings/core/common/content_settings_utils.h" |
#include "content/public/browser/browser_thread.h" |
using content::BrowserThread; |
@@ -27,7 +28,6 @@ using content_settings::Rule; |
using content_settings::RuleIterator; |
using content_settings::OriginIdentifierValueMap; |
using content_settings::ResourceIdentifier; |
-using content_settings::ValueToContentSetting; |
namespace extensions { |
@@ -276,7 +276,8 @@ std::unique_ptr<base::ListValue> ContentSettingsStore::GetSettingsForExtension( |
helpers::ContentSettingsTypeToString(key.content_type)); |
setting_dict->SetString(keys::kResourceIdentifierKey, |
key.resource_identifier); |
- ContentSetting content_setting = ValueToContentSetting(rule.value.get()); |
+ ContentSetting content_setting = |
+ content_settings::ValueToContentSetting(rule.value.get()); |
DCHECK_NE(CONTENT_SETTING_DEFAULT, content_setting); |
std::string setting_string = |