Port DictionaryValue to use string16 instead of wstring.

chrome/browser/browser_init.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 "chrome/browser/browser_init.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/event_recorder.h"
 #include "base/histogram.h"
@@ skipping 95 matching lines @@
 
 void SetOverrideHomePage(const CommandLine& command_line,
                          PrefService* prefs) {
   // If homepage is specified on the command line, canonify & store it.
   if (command_line.HasSwitch(switches::kHomePage)) {
     std::wstring browser_directory;
     PathService::Get(base::DIR_CURRENT, &browser_directory);
     std::wstring new_homepage = URLFixerUpper::FixupRelativeFile(
         browser_directory,
         command_line.GetSwitchValue(switches::kHomePage));
-    prefs->transient()->SetString(prefs::kHomePage, new_homepage);
-    prefs->transient()->SetBoolean(prefs::kHomePageIsNewTabPage, false);
+    prefs->transient()->SetString(WideToUTF16Hack(prefs::kHomePage),
+                                  WideToUTF16Hack(new_homepage));
+    prefs->transient()->SetBoolean(
+        WideToUTF16Hack(prefs::kHomePageIsNewTabPage), false);
   }
 }
 
 SessionStartupPref GetSessionStartupPref(const CommandLine& command_line,
                                          Profile* profile) {
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(profile);
   if (command_line.HasSwitch(switches::kRestoreLastSession))
     pref.type = SessionStartupPref::LAST;
   if (command_line.HasSwitch(switches::kIncognito) &&
       pref.type == SessionStartupPref::LAST) {
@@ skipping 339 matching lines @@
           profile,
           static_cast<size_t>(expected_tab_count));
     }
 #endif
   }
 
   // Allow the command line to override the persisted setting of home page.
   SetOverrideHomePage(command_line, profile->GetPrefs());
 
   if (command_line.HasSwitch(switches::kBrowserStartRenderersManually))
-    prefs->transient()->SetBoolean(prefs::kStartRenderersManually, true);
+    prefs->transient()->SetBoolean(
+        WideToUTF16Hack(prefs::kStartRenderersManually), true);
 
   bool silent_launch = false;
 #if defined(OS_WIN)
   if (command_line.HasSwitch(switches::kAutomationClientChannelID)) {
     std::wstring automation_channel_id =
         command_line.GetSwitchValue(switches::kAutomationClientChannelID);
     // If there are any loose parameters, we expect each one to generate a
     // new tab; if there are none then we have no tabs
     size_t expected_tabs =
         std::max(static_cast<int>(command_line.GetLooseValues().size()),
@@ skipping 74 matching lines @@
   bool launched = lwp.Launch(profile, process_startup);
   if (!launched) {
     LOG(ERROR) << "launch error";
     if (return_code != NULL)
       *return_code = ResultCodes::INVALID_CMDLINE_URL;
     return false;
   }
 
   return true;
 }