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

components/content_settings/core/browser/content_settings_utils.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_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 73 matching lines @@
     case CONTENT_SETTING_SESSION_ONLY:
       return "session";
     case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT:
       return "detect";
     case CONTENT_SETTING_DEFAULT:
       return "default";
     case CONTENT_SETTING_NUM_SETTINGS:
       NOTREACHED();
   }
 
-  return std::string();
+  return ResourceIdentifier();
 }
 
 ContentSetting ContentSettingFromString(const std::string& name) {
   if (name == "allow")
     return CONTENT_SETTING_ALLOW;
   if (name == "ask")
     return CONTENT_SETTING_ASK;
   if (name == "block")
     return CONTENT_SETTING_BLOCK;
   if (name == "session")
@@ skipping 117 matching lines @@
         *secondary_pattern = rule.secondary_pattern;
       return rule.value.get()->DeepCopy();
     }
   }
   return NULL;
 }
 
 void GetRendererContentSettingRules(const HostContentSettingsMap* map,
                                     RendererContentSettingRules* rules) {
   map->GetSettingsForOneType(
-      CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules));
+      CONTENT_SETTINGS_TYPE_IMAGES,
+      ResourceIdentifier(),
+      &(rules->image_rules));
   map->GetSettingsForOneType(
-      CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules));
+      CONTENT_SETTINGS_TYPE_JAVASCRIPT,
+      ResourceIdentifier(),
+      &(rules->script_rules));
 }
 
 }  // namespace content_settings