Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Unified Diff: components/content_settings/core/browser/content_settings_pref_provider.cc

Issue 1076153002: Coverting std::String() to ResourceIdentifier() in content_settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/content_settings/core/browser/content_settings_pref_provider.cc
diff --git a/components/content_settings/core/browser/content_settings_pref_provider.cc b/components/content_settings/core/browser/content_settings_pref_provider.cc
index f53acc38e0d9e9d35d2fd77e8dd948167a5e3da3..6f7c006238bba200f07555d6340f1db27024a5f0 100644
--- a/components/content_settings/core/browser/content_settings_pref_provider.cc
+++ b/components/content_settings/core/browser/content_settings_pref_provider.cc
@@ -300,7 +300,7 @@ void PrefProvider::MigrateObsoleteMediaContentSetting() {
std::vector<Rule> rules_to_delete;
{
scoped_ptr<RuleIterator> rule_iterator(GetRuleIterator(
- CONTENT_SETTINGS_TYPE_MEDIASTREAM, std::string(), false));
+ CONTENT_SETTINGS_TYPE_MEDIASTREAM, ResourceIdentifier(), false));
while (rule_iterator->HasNext()) {
// Skip default setting and rules without a value.
const content_settings::Rule& rule = rule_iterator->Next();
@@ -325,7 +325,7 @@ void PrefProvider::MigrateObsoleteMediaContentSetting() {
SetWebsiteSetting(it->primary_pattern,
it->secondary_pattern,
CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
- std::string(),
+ ResourceIdentifier(),
new base::FundamentalValue(CONTENT_SETTING_ALLOW));
}
// Add the exception to the new camera content setting.
@@ -333,7 +333,7 @@ void PrefProvider::MigrateObsoleteMediaContentSetting() {
SetWebsiteSetting(it->primary_pattern,
it->secondary_pattern,
CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
- std::string(),
+ ResourceIdentifier(),
new base::FundamentalValue(CONTENT_SETTING_ALLOW));
}
@@ -341,7 +341,7 @@ void PrefProvider::MigrateObsoleteMediaContentSetting() {
SetWebsiteSetting(it->primary_pattern,
it->secondary_pattern,
CONTENT_SETTINGS_TYPE_MEDIASTREAM,
- std::string(),
+ ResourceIdentifier(),
NULL);
}
}

Powered by Google App Engine
This is Rietveld 408576698