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

components/content_settings/core/browser/content_settings_default_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_default_provider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 249 matching lines @@
     // If the changed setting is syncable, write it to the old dictionary
     // preference as well, so it can be synced to older versions of Chrome.
     // TODO(msramek): Remove this after two stable releases.
     if (kDefaultSettings[content_type].syncable)
       WriteDictionaryPref(content_type, value.get());
   }
 
   NotifyObservers(ContentSettingsPattern(),
                   ContentSettingsPattern(),
                   content_type,
-                  std::string());
+                  ResourceIdentifier());
 
   return true;
 }
 
 RuleIterator* DefaultProvider::GetRuleIterator(
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier,
     bool incognito) const {
   base::AutoLock lock(lock_);
   if (resource_identifier.empty()) {
@@ skipping 135 matching lines @@
     ChangeSetting(content_type, ReadIndividualPref(content_type).get());
     if (kDefaultSettings[content_type].syncable)
       WriteDictionaryPref(content_type, default_settings_[content_type].get());
     to_notify.push_back(content_type);
   }
 
   for (const ContentSettingsType content_type : to_notify) {
     NotifyObservers(ContentSettingsPattern(),
                     ContentSettingsPattern(),
                     content_type,
-                    std::string());
+                    ResourceIdentifier());
   }
 }
 
 scoped_ptr<base::Value> DefaultProvider::ReadIndividualPref(
     ContentSettingsType content_type) {
   int int_value = prefs_->GetInteger(kDefaultSettings[content_type].pref_name);
   return ContentSettingToValue(IntToContentSetting(int_value)).Pass();
 }
 
 scoped_ptr<DefaultProvider::ValueMap> DefaultProvider::ReadDictionaryPref() {
@@ skipping 82 matching lines @@
   scoped_ptr<base::Value> value = ReadIndividualPref(
       CONTENT_SETTINGS_TYPE_MEDIASTREAM);
   WriteIndividualPref(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, value.get());
   WriteIndividualPref(CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, value.get());
   WriteIndividualPref(CONTENT_SETTINGS_TYPE_MEDIASTREAM, NULL);
 
   prefs_->SetBoolean(prefs::kMigratedDefaultMediaStreamSetting, true);
 }
 
 }  // namespace content_settings