Coverting std::String() to ResourceIdentifier() in content_settings.

components/content_settings/core/browser/content_settings_pref_provider.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/content_settings/core/browser/content_settings_pref_provider.h"
 
 #include <map>
 #include <string>
 #include <utility>
 
@@ skipping 282 matching lines @@
 
   return *this;
 }
 
 PrefProvider::ContentSettingsPrefEntry::~ContentSettingsPrefEntry() {}
 
 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();
       DCHECK(rule.primary_pattern != ContentSettingsPattern::Wildcard());
       if (!rule.value.get())
         continue;
       rules_to_delete.push_back(rule);
     }
   }
 
   for (std::vector<Rule>::const_iterator it = rules_to_delete.begin();
        it != rules_to_delete.end(); ++it) {
     const base::DictionaryValue* value_dict = NULL;
     if (!it->value->GetAsDictionary(&value_dict) || value_dict->empty())
       return;
 
     std::string audio_device, video_device;
     value_dict->GetString(kAudioKey, &audio_device);
     value_dict->GetString(kVideoKey, &video_device);
     // Add the exception to the new microphone content setting.
     if (!audio_device.empty()) {
       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.
     if (!video_device.empty()) {
       SetWebsiteSetting(it->primary_pattern,
                         it->secondary_pattern,
                         CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
-                        std::string(),
+                        ResourceIdentifier(),
                         new base::FundamentalValue(CONTENT_SETTING_ALLOW));
     }
 
     // Remove the old exception in CONTENT_SETTINGS_TYPE_MEDIASTREAM.
     SetWebsiteSetting(it->primary_pattern,
                       it->secondary_pattern,
                       CONTENT_SETTINGS_TYPE_MEDIASTREAM,
-                      std::string(),
+                      ResourceIdentifier(),
                       NULL);
   }
 }
 
 void PrefProvider::Notify(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type,
     const std::string& resource_identifier) {
   NotifyObservers(primary_pattern,
@@ skipping 172 matching lines @@
 bool PrefProvider::TestAllLocks() const {
   for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     if (!content_settings_prefs_[i]->lock_.Try())
       return false;
     content_settings_prefs_[i]->lock_.Release();
   }
   return true;
 }
 
 }  // namespace content_settings