Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / content_settings / content_settings_origin_identifier_value_map.cc

diff --git a/src/chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc b/src/chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc
index c46cf91..938fd8e 100644 (file)
--- a/src/chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc
+++ b/src/chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc
@@ -11,7 +11,7 @@
 #include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_rule.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
-#include "chrome/common/content_settings_types.h"
+#include "components/content_settings/core/common/content_settings_types.h"
 #include "url/gurl.h"
 
 namespace content_settings {
@@ -120,7 +120,7 @@ OriginIdentifierValueMap::OriginIdentifierValueMap() {}
 
 OriginIdentifierValueMap::~OriginIdentifierValueMap() {}
 
-Value* OriginIdentifierValueMap::GetValue(
+base::Value* OriginIdentifierValueMap::GetValue(
     const GURL& primary_url,
     const GURL& secondary_url,
     ContentSettingsType content_type,
@@ -148,7 +148,7 @@ void OriginIdentifierValueMap::SetValue(
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier,
-    Value* value) {
+    base::Value* value) {
   DCHECK(primary_pattern.IsValid());
   DCHECK(secondary_pattern.IsValid());
   DCHECK(value);