1 files changed, 18 insertions, 12 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index fc4513c..07c87fc 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -144,16 +144,22 @@ void HandleErrorTestParameters(const CommandLine& command_line) {
 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),
@@ -508,8 +514,8 @@ int BrowserMain(const MainFunctionParams& parameters) {
   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);