Port DictionaryValue to use string16 instead of wstring.

chrome/browser/browser_main.cc

 // Copyright (c) 2006-2008 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 "build/build_config.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/field_trial.h"
@@ skipping 126 matching lines @@
 
 #if defined(OS_WIN) || defined(OS_LINUX)
 // The net module doesn't have access to this HTML or the strings that need to
 // be localized.  The Chrome locale will never change while we're running, so
 // it's safe to have a static string that we always return a pointer into.
 // This allows us to have the ResourceProvider return a pointer into the actual
 // resource (via a StringPiece), instead of always copying resources.
 struct LazyDirectoryListerCacher {
   LazyDirectoryListerCacher() {
     DictionaryValue value;
-    value.SetString(L"header",
-                    l10n_util::GetString(IDS_DIRECTORY_LISTING_HEADER));
-    value.SetString(L"parentDirText",
-                    l10n_util::GetString(IDS_DIRECTORY_LISTING_PARENT));
-    value.SetString(L"headerName",
-                    l10n_util::GetString(IDS_DIRECTORY_LISTING_NAME));
-    value.SetString(L"headerSize",
-                    l10n_util::GetString(IDS_DIRECTORY_LISTING_SIZE));
-    value.SetString(L"headerDateModified",
-                    l10n_util::GetString(IDS_DIRECTORY_LISTING_DATE_MODIFIED));
+    value.SetString(
+        ASCIIToUTF16("header"),
+        WideToUTF16Hack(l10n_util::GetString(IDS_DIRECTORY_LISTING_HEADER)));
+    value.SetString(
+        ASCIIToUTF16("parentDirText"),
+        WideToUTF16Hack(l10n_util::GetString(IDS_DIRECTORY_LISTING_PARENT)));
+    value.SetString(
+        ASCIIToUTF16("headerName"),
+        WideToUTF16Hack(l10n_util::GetString(IDS_DIRECTORY_LISTING_NAME)));
+    value.SetString(
+        ASCIIToUTF16("headerSize"),
+        WideToUTF16Hack(l10n_util::GetString(IDS_DIRECTORY_LISTING_SIZE)));
+    value.SetString(
+        ASCIIToUTF16("headerDateModified"),
+        WideToUTF16Hack(
+            l10n_util::GetString(IDS_DIRECTORY_LISTING_DATE_MODIFIED)));
     html_data = jstemplate_builder::GetTemplateHtml(
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             IDR_DIR_HEADER_HTML),
         &value,
         "t");
   }
 
   std::string html_data;
 };
 
@@ skipping 334 matching lines @@
   if (parsed_command_line.HasSwitch(switches::kSdchFilter)) {
     switch_domain =
         WideToASCII(parsed_command_line.GetSwitchValue(switches::kSdchFilter));
   }
   sdch_manager.EnableSdchSupport(switch_domain);
 #endif
 
   MetricsService* metrics = NULL;
   if (!parsed_command_line.HasSwitch(switches::kDisableMetrics)) {
     if (parsed_command_line.HasSwitch(switches::kMetricsRecordingOnly)) {
-      local_state->transient()->SetBoolean(prefs::kMetricsReportingEnabled,
-                                           false);
+      local_state->transient()->SetBoolean(
+          WideToUTF16Hack(prefs::kMetricsReportingEnabled), false);
     }
     metrics = browser_process->metrics_service();
     DCHECK(metrics);
 
     // If we're testing then we don't care what the user preference is, we turn
     // on recording, but not reporting, otherwise tests fail.
     if (parsed_command_line.HasSwitch(switches::kMetricsRecordingOnly)) {
       metrics->StartRecordingOnly();
     } else {
       // If the user permits metrics reporting with the checkbox in the
@@ skipping 42 matching lines @@
   if (metrics)
     metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   browser_process.release();
   browser_shutdown::Shutdown();
 
   return result_code;
 }