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

chrome/browser/plugin_updater.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/browser/plugin_updater.h"
 
 #include <string>
 #include <vector>
 
 #include "base/path_service.h"
@@ skipping 26 matching lines @@
       group = PluginGroup::FindHardcodedPluginGroup(web_plugin);
       plugin_groups->push_back(linked_ptr<PluginGroup>(group));
     }
     group->AddPlugin(web_plugin, i);
   }
 }
 
 static DictionaryValue* CreatePluginFileSummary(
     const WebPluginInfo& plugin) {
   DictionaryValue* data = new DictionaryValue();
-  data->SetString(L"path", plugin.path.value());
-  data->SetStringFromUTF16(L"name", plugin.name);
-  data->SetStringFromUTF16(L"version", plugin.version);
-  data->SetBoolean(L"enabled", plugin.enabled);
+  data->SetString("path", plugin.path.value());
+  data->SetString("name", plugin.name);
+  data->SetString("version", plugin.version);
+  data->SetBoolean("enabled", plugin.enabled);
   return data;
 }
 
 ListValue* GetPluginGroupsData() {
   std::vector<linked_ptr<PluginGroup> > plugin_groups;
   GetPluginGroups(&plugin_groups);
 
   // Construct DictionaryValues to return to the UI
   ListValue* plugin_groups_data = new ListValue();
   for (std::vector<linked_ptr<PluginGroup> >::iterator it =
@@ skipping 61 matching lines @@
          it != saved_plugins_list->end();
          ++it) {
       if (!(*it)->IsType(Value::TYPE_DICTIONARY)) {
         LOG(WARNING) << "Invalid entry in " << prefs::kPluginsPluginsList;
         continue;  // Oops, don't know what to do with this item.
       }
 
       DictionaryValue* plugin = static_cast<DictionaryValue*>(*it);
       string16 group_name;
       bool enabled = true;
-      plugin->GetBoolean(L"enabled", &enabled);
+      plugin->GetBoolean("enabled", &enabled);
 
       FilePath::StringType path;
       // The plugin list constains all the plugin files in addition to the
       // plugin groups.
-      if (plugin->GetString(L"path", &path)) {
+      if (plugin->GetString("path", &path)) {
         // Files have a path attribute, groups don't.
         FilePath plugin_path(path);
         if (update_internal_dir &&
             FilePath::CompareIgnoreCase(plugin_path.DirName().value(),
                 last_internal_dir.value()) == 0) {
           // If the internal plugin directory has changed and if the plugin
           // looks internal, update its path in the prefs.
           plugin_path = cur_internal_dir.Append(plugin_path.BaseName());
           path = plugin_path.value();
-          plugin->SetString(L"path", path);
+          plugin->SetString("path", path);
         }
 
         if (FilePath::CompareIgnoreCase(path, pdf_path_str) == 0) {
           found_internal_pdf = true;
           if (!enabled && force_enable_internal_pdf) {
             enabled = true;
-            plugin->SetBoolean(L"enabled", true);
+            plugin->SetBoolean("enabled", true);
           }
         }
         if (!enabled)
           NPAPI::PluginList::Singleton()->DisablePlugin(plugin_path);
-      } else if (!enabled && plugin->GetStringAsUTF16(L"name", &group_name)) {
+      } else if (!enabled && plugin->GetStringAsUTF16("name", &group_name)) {
         // Otherwise this is a list of groups.
         EnablePluginGroup(false, group_name);
       }
     }
   }
 
   // Build the set of policy-disabled plugins once and cache it.
   // Don't do this in the constructor, there's no profile available there.
   std::set<string16> policy_disabled_plugins;
   const ListValue* plugin_blacklist =
@@ skipping 63 matching lines @@
        it != plugin_groups.end();
        ++it) {
     // Don't save preferences for vulnerable pugins.
     if (!(*it)->IsVulnerable()) {
       plugins_list->Append((*it)->GetSummary());
     }
   }
 }
 
 }  // namespace plugin_updater