Index: chrome/browser/content_settings/content_settings_utils.cc |
diff --git a/chrome/browser/content_settings/content_settings_utils.cc b/chrome/browser/content_settings/content_settings_utils.cc |
index 5c27fdb414dde52bf3f314310a317bafcb4221ac..ab95d6ca781b7bdf04de03f7e736e4ba0b6cbebd 100644 |
--- a/chrome/browser/content_settings/content_settings_utils.cc |
+++ b/chrome/browser/content_settings/content_settings_utils.cc |
@@ -15,6 +15,7 @@ |
#include "chrome/browser/content_settings/content_settings_provider.h" |
#include "chrome/browser/content_settings/content_settings_rule.h" |
#include "chrome/browser/content_settings/host_content_settings_map.h" |
+#include "chrome/common/chrome_content_settings_client.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/common/content_settings_pattern.h" |
#include "url/gurl.h" |
@@ -79,9 +80,10 @@ bool GetTypeFromName(const std::string& name, |
std::string CreatePatternString( |
const ContentSettingsPattern& item_pattern, |
const ContentSettingsPattern& top_level_frame_pattern) { |
- return item_pattern.ToString() |
+ content_settings::ChromeContentSettingsClient client; |
+ return item_pattern.ToString(&client) |
+ std::string(kPatternSeparator) |
- + top_level_frame_pattern.ToString(); |
+ + top_level_frame_pattern.ToString(&client); |
} |
PatternPair ParsePatternString(const std::string& pattern_str) { |
@@ -107,11 +109,12 @@ PatternPair ParsePatternString(const std::string& pattern_str) { |
ContentSettingsPattern()); |
} |
+ content_settings::ChromeContentSettingsClient client; |
PatternPair pattern_pair; |
pattern_pair.first = |
- ContentSettingsPattern::FromString(pattern_str_list[0]); |
+ ContentSettingsPattern::FromString(&client, pattern_str_list[0]); |
pattern_pair.second = |
- ContentSettingsPattern::FromString(pattern_str_list[1]); |
+ ContentSettingsPattern::FromString(&client, pattern_str_list[1]); |
return pattern_pair; |
} |