Rename DictionaryValue's SetStringFromUTF16() to SetString() (and overload).

chrome/common/plugin_group.cc

 // Copyright (c) 2010 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 "chrome/common/plugin_group.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
@@ skipping 234 matching lines @@
       Version::GetVersionFromString(version));
   if (plugin_version.get() != NULL) {
     if (plugin_version->CompareTo(*(max_version_)) > 0) {
       max_version_.reset(plugin_version.release());
     }
   }
 }
 
 DictionaryValue* PluginGroup::GetSummary() const {
   DictionaryValue* result = new DictionaryValue();
-  result->SetStringFromUTF16(L"name", group_name_);
-  result->SetBoolean(L"enabled", enabled_);
+  result->SetString("name", group_name_);
+  result->SetBoolean("enabled", enabled_);
   return result;
 }
 
 DictionaryValue* PluginGroup::GetDataForUI() const {
   DictionaryValue* result = new DictionaryValue();
-  result->SetStringFromUTF16(L"name", group_name_);
-  result->SetStringFromUTF16(L"description", description_);
-  result->SetString(L"version", max_version_->GetString());
-  result->SetString(L"update_url", update_url_);
-  result->SetBoolean(L"critical", IsVulnerable());
+  result->SetString("name", group_name_);
+  result->SetString("description", description_);
+  result->SetString("version", max_version_->GetString());
+  result->SetString("update_url", update_url_);
+  result->SetBoolean("critical", IsVulnerable());
 
   bool group_disabled_by_policy = IsPluginNameDisabledByPolicy(group_name_);
   if (group_disabled_by_policy) {
-    result->SetString(L"enabledMode", L"disabledByPolicy");
+    result->SetString("enabledMode", "disabledByPolicy");
   } else {
-    result->SetString(L"enabledMode",
-                      enabled_ ? L"enabled" : L"disabledByUser");
+    result->SetString("enabledMode", enabled_ ? "enabled" : "disabledByUser");
   }
 
   ListValue* plugin_files = new ListValue();
   for (size_t i = 0; i < web_plugin_infos_.size(); ++i) {
     const WebPluginInfo& web_plugin = web_plugin_infos_[i];
     int priority = web_plugin_positions_[i];
     DictionaryValue* plugin_file = new DictionaryValue();
-    plugin_file->SetStringFromUTF16(L"name", web_plugin.name);
-    plugin_file->SetStringFromUTF16(L"description", web_plugin.desc);
-    plugin_file->SetString(L"path", web_plugin.path.value());
-    plugin_file->SetStringFromUTF16(L"version", web_plugin.version);
+    plugin_file->SetString("name", web_plugin.name);
+    plugin_file->SetString("description", web_plugin.desc);
+    plugin_file->SetString("path", web_plugin.path.value());
+    plugin_file->SetString("version", web_plugin.version);
     bool plugin_disabled_by_policy = group_disabled_by_policy ||
         IsPluginNameDisabledByPolicy(web_plugin.name);
     if (plugin_disabled_by_policy) {
-      result->SetString(L"enabledMode", L"disabledByPolicy");
+      result->SetString("enabledMode", "disabledByPolicy");
     } else {
-      result->SetString(L"enabledMode",
-                        web_plugin.enabled ? L"enabled" : L"disabledByUser");
+      result->SetString("enabledMode",
+                        web_plugin.enabled ? "enabled" : "disabledByUser");
     }
-    plugin_file->SetInteger(L"priority", priority);
+    plugin_file->SetInteger("priority", priority);
 
     ListValue* mime_types = new ListValue();
     for (std::vector<WebPluginMimeType>::const_iterator type_it =
          web_plugin.mime_types.begin();
          type_it != web_plugin.mime_types.end();
          ++type_it) {
       DictionaryValue* mime_type = new DictionaryValue();
-      mime_type->SetString(L"mimeType", type_it->mime_type);
-      mime_type->SetStringFromUTF16(L"description", type_it->description);
+      mime_type->SetString("mimeType", type_it->mime_type);
+      mime_type->SetString("description", type_it->description);
 
       ListValue* file_extensions = new ListValue();
       for (std::vector<std::string>::const_iterator ext_it =
            type_it->file_extensions.begin();
            ext_it != type_it->file_extensions.end();
            ++ext_it) {
         file_extensions->Append(new StringValue(*ext_it));
       }
-      mime_type->Set(L"fileExtensions", file_extensions);
+      mime_type->Set("fileExtensions", file_extensions);
 
       mime_types->Append(mime_type);
     }
-    plugin_file->Set(L"mimeTypes", mime_types);
+    plugin_file->Set("mimeTypes", mime_types);
 
     plugin_files->Append(plugin_file);
   }
-  result->Set(L"plugin_files", plugin_files);
+  result->Set("plugin_files", plugin_files);
 
   return result;
 }
 
 // Returns true if the latest version of this plugin group is vulnerable.
 bool PluginGroup::IsVulnerable() const {
   if (min_version_.get() == NULL || max_version_->GetString() == "0") {
     return false;
   }
   return max_version_->CompareTo(*min_version_) < 0;
 }
 
 void PluginGroup::Enable(bool enable) {
   for (std::vector<WebPluginInfo>::const_iterator it =
        web_plugin_infos_.begin();
        it != web_plugin_infos_.end(); ++it) {
     if (enable && !IsPluginNameDisabledByPolicy(it->name)) {
       NPAPI::PluginList::Singleton()->EnablePlugin(FilePath(it->path));
     } else {
       NPAPI::PluginList::Singleton()->DisablePlugin(FilePath(it->path));
     }
   }
 }