Removing un-necessary conversion from std::string to base::string16.

chrome/browser/metrics/plugin_metrics_provider.cc

 // Copyright 2014 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/metrics/plugin_metrics_provider.h"
 
 #include <string>
 
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
@@ skipping 199 matching lines @@
 
   for (base::ListValue::iterator value_iter = plugins->begin();
        value_iter != plugins->end(); ++value_iter) {
     if (!(*value_iter)->IsType(base::Value::TYPE_DICTIONARY)) {
       NOTREACHED();
       continue;
     }
 
     base::DictionaryValue* plugin_dict =
         static_cast<base::DictionaryValue*>(*value_iter);
-    std::string plugin_name;
+    base::string16 plugin_name;
     plugin_dict->GetString(prefs::kStabilityPluginName, &plugin_name);
     if (plugin_name.empty()) {
       NOTREACHED();
       continue;
     }
 
-    // TODO(viettrungluu): remove conversions
-    base::string16 name16 = base::UTF8ToUTF16(plugin_name);
-    if (child_process_stats_buffer_.find(name16) ==
+    if (child_process_stats_buffer_.find(plugin_name) ==
         child_process_stats_buffer_.end()) {
       continue;
     }
 
-    ChildProcessStats stats = child_process_stats_buffer_[name16];
+    ChildProcessStats stats = child_process_stats_buffer_[plugin_name];
     if (stats.process_launches) {
       int launches = 0;
       plugin_dict->GetInteger(prefs::kStabilityPluginLaunches, &launches);
       launches += stats.process_launches;
       plugin_dict->SetInteger(prefs::kStabilityPluginLaunches, launches);
     }
     if (stats.process_crashes) {
       int crashes = 0;
       plugin_dict->GetInteger(prefs::kStabilityPluginCrashes, &crashes);
       crashes += stats.process_crashes;
       plugin_dict->SetInteger(prefs::kStabilityPluginCrashes, crashes);
     }
     if (stats.instances) {
       int instances = 0;
       plugin_dict->GetInteger(prefs::kStabilityPluginInstances, &instances);
       instances += stats.instances;
       plugin_dict->SetInteger(prefs::kStabilityPluginInstances, instances);
     }
     if (stats.loading_errors) {
       int loading_errors = 0;
       plugin_dict->GetInteger(prefs::kStabilityPluginLoadingErrors,
                               &loading_errors);
       loading_errors += stats.loading_errors;
       plugin_dict->SetInteger(prefs::kStabilityPluginLoadingErrors,
                               loading_errors);
     }
 
-    child_process_stats_buffer_.erase(name16);
+    child_process_stats_buffer_.erase(plugin_name);
   }
 
   // Now go through and add dictionaries for plugins that didn't already have
   // reports in Local State.
-  for (std::map<base::string16, ChildProcessStats>::iterator cache_iter =
-           child_process_stats_buffer_.begin();
+  for (auto cache_iter = child_process_stats_buffer_.begin();
        cache_iter != child_process_stats_buffer_.end(); ++cache_iter) {
     ChildProcessStats stats = cache_iter->second;
 
     // Insert only plugins information into the plugins list.
     if (!IsPluginProcess(stats.process_type))
       continue;
 
-    // TODO(viettrungluu): remove conversion
-    std::string plugin_name = base::UTF16ToUTF8(cache_iter->first);
-
     base::DictionaryValue* plugin_dict = new base::DictionaryValue;
 
-    plugin_dict->SetString(prefs::kStabilityPluginName, plugin_name);
+    plugin_dict->SetString(prefs::kStabilityPluginName, cache_iter->first);
     plugin_dict->SetInteger(prefs::kStabilityPluginLaunches,
                             stats.process_launches);
     plugin_dict->SetInteger(prefs::kStabilityPluginCrashes,
                             stats.process_crashes);
     plugin_dict->SetInteger(prefs::kStabilityPluginInstances,
                             stats.instances);
     plugin_dict->SetInteger(prefs::kStabilityPluginLoadingErrors,
                             stats.loading_errors);
     plugins->Append(plugin_dict);
   }
@@ skipping 97 matching lines @@
 }
 
 bool PluginMetricsProvider::RecordCurrentStateIfPending() {
   if (!weak_ptr_factory_.HasWeakPtrs())
     return false;
 
   weak_ptr_factory_.InvalidateWeakPtrs();
   RecordCurrentState();
   return true;
 }