Cleanup: Don't bother doing no-op wide/utf16 conversions on Windows.

components/crash/app/crash_keys_win.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 "components/crash/app/crash_keys_win.h"
 
 #include <algorithm>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
-#include "base/strings/utf_string_conversions.h"
 #include "components/crash/app/crash_reporter_client.h"
 
 namespace breakpad {
 
 using crash_reporter::CrashReporterClient;
 
 namespace {
 
 const size_t kMaxPluginPathLength = 256;
 const size_t kMaxDynamicEntries = 256;
@@ skipping 63 matching lines @@
   crash_client->GetProductNameAndVersion(
       base::FilePath(exe_path),
       &product,
       &version,
       &special_build,
       &channel_name);
 
   // We only expect this method to be called once per process.
   // Common enties
   custom_entries_.push_back(
-      google_breakpad::CustomInfoEntry(L"ver",
-                                       base::UTF16ToWide(version).c_str()));
+      google_breakpad::CustomInfoEntry(L"ver", version.c_str()));
   custom_entries_.push_back(
-      google_breakpad::CustomInfoEntry(L"prod",
-                                       base::UTF16ToWide(product).c_str()));
+      google_breakpad::CustomInfoEntry(L"prod", product.c_str()));
   custom_entries_.push_back(
       google_breakpad::CustomInfoEntry(L"plat", L"Win32"));
   custom_entries_.push_back(
       google_breakpad::CustomInfoEntry(L"ptype", type.c_str()));
-  custom_entries_.push_back(google_breakpad::CustomInfoEntry(
-      L"pid", base::StringPrintf(L"%d", ::GetCurrentProcessId()).c_str()));
-  custom_entries_.push_back(google_breakpad::CustomInfoEntry(
-      L"channel", base::UTF16ToWide(channel_name).c_str()));
-  custom_entries_.push_back(google_breakpad::CustomInfoEntry(
-      L"profile-type", profile_type.c_str()));
+  custom_entries_.push_back(
+      google_breakpad::CustomInfoEntry(
+      L"pid", base::IntToString16(::GetCurrentProcessId()).c_str()));
+  custom_entries_.push_back(
+      google_breakpad::CustomInfoEntry(L"channel", channel_name.c_str()));
+  custom_entries_.push_back(
+      google_breakpad::CustomInfoEntry(L"profile-type", profile_type.c_str()));
 
-  if (!special_build.empty())
-    custom_entries_.push_back(google_breakpad::CustomInfoEntry(
-        L"special", base::UTF16ToWide(special_build).c_str()));
+  if (!special_build.empty()) {
+    custom_entries_.push_back(
+        google_breakpad::CustomInfoEntry(L"special", special_build.c_str()));
+  }
 
   if (type == L"plugin" || type == L"ppapi") {
     std::wstring plugin_path = cmd_line->GetSwitchValueNative("plugin-path");
     if (!plugin_path.empty())
       SetPluginPath(plugin_path);
   }
 
-
   // Check whether configuration management controls crash reporting.
   bool crash_reporting_enabled = true;
   bool controlled_by_policy = crash_client->ReportingIsEnforcedByPolicy(
       &crash_reporting_enabled);
   bool use_crash_service = !controlled_by_policy &&
       (cmd_line->HasSwitch(switches::kNoErrorDialogs) ||
           crash_client->IsRunningUnattended());
   if (use_crash_service)
     SetBreakpadDumpPath(crash_client);
 
@@ skipping 49 matching lines @@
 
   std::wstring key_string(key);
   DynamicEntriesMap::iterator it = dynamic_entries_.find(key_string);
   if (it == dynamic_entries_.end())
     return;
 
   it->second->set_value(NULL);
 }
 
 }  // namespace breakpad