Upstream version 10.39.225.0

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

diff --git a/src/chrome/browser/content_settings/content_settings_policy_provider.cc b/src/chrome/browser/content_settings/content_settings_policy_provider.cc
index f41669e..27ab259 100644 (file)
--- a/src/chrome/browser/content_settings/content_settings_policy_provider.cc
+++ b/src/chrome/browser/content_settings/content_settings_policy_provider.cc
@@ -10,15 +10,12 @@
 #include "base/json/json_reader.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/content_settings/content_settings_rule.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
-#include "chrome/common/content_settings_pattern.h"
 #include "chrome/common/pref_names.h"
+#include "components/content_settings/core/browser/content_settings_rule.h"
+#include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
 
 using content::BrowserThread;
 
@@ -370,7 +367,7 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences(
     // Ignore invalid patterns.
     if (!pattern.IsValid()) {
       VLOG(1) << "Ignoring invalid certificate auto select setting:"
-                 " Invalid content settings pattern: " << pattern;
+                 " Invalid content settings pattern: " << pattern.ToString();
       continue;
     }