Use ASCII strings for switch names.

Review URL: http://codereview.chromium.org/270062

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28779 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 356 insertions, 353 deletions

diff --git a/chrome/common/chrome_plugin_util.cc b/chrome/common/chrome_plugin_util.cc
index 9258d98..809e4e6 100644
--- a/chrome/common/chrome_plugin_util.cc
+++ b/chrome/common/chrome_plugin_util.cc
@@ -132,7 +132,8 @@ CPError CPB_GetCommandLineArgumentsCommon(const char* url,
     // Make sure user_data_dir is an absolute path.
     if (file_util::AbsolutePath(&user_data_dir) &&
         file_util::PathExists(user_data_dir)) {
-      arguments_w += std::wstring(L"--") + switches::kUserDataDir +
+      // TODO(evanm): use CommandLine APIs instead of this.
+      arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kUserDataDir) +
                      L"=\"" + user_data_dir + L"\" ";
     }
   }
@@ -146,7 +147,9 @@ CPError CPB_GetCommandLineArgumentsCommon(const char* url,
   ReplaceSubstringsAfterOffset(&url_string, 0, ";", "");
   ReplaceSubstringsAfterOffset(&url_string, 0, "$", "");
   std::wstring url_w = UTF8ToWide(url_string);
-  arguments_w += std::wstring(L"--") + switches::kApp + L"=\"" + url_w + L"\"";
+  // TODO(evanm): use CommandLine APIs instead of this.
+  arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kApp) +
+      L"=\"" + url_w + L"\"";
 
   *arguments = WideToUTF8(arguments_w);
 
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 26ce6a4..6d3fb14 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -12,454 +12,454 @@ namespace switches {
 // base/base_switches.cc instead.
 
 // Suppresses hang monitor dialogs in renderer processes.
-const wchar_t kDisableHangMonitor[]            = L"disable-hang-monitor";
+const char kDisableHangMonitor[]            = "disable-hang-monitor";
 
 // Completely disables UMA metrics system.
-const wchar_t kDisableMetrics[]                = L"disable-metrics";
+const char kDisableMetrics[]                = "disable-metrics";
 
 // Enables the recording of metrics reports but disables reporting.
 // In contrast to kDisableMetrics, this executes all the code that a normal
 // client would use for reporting, except the report is dropped rather than sent
 // to the server. This is useful for finding issues in the metrics code during
 // UI and performance tests.
-const wchar_t kMetricsRecordingOnly[]          = L"metrics-recording-only";
+const char kMetricsRecordingOnly[]          = "metrics-recording-only";
 
 // Causes the browser process to throw an assertion on startup.
-const wchar_t kBrowserAssertTest[]             = L"assert-test";
+const char kBrowserAssertTest[]             = "assert-test";
 
 // Causes the renderer process to throw an assertion on launch.
-const wchar_t kRendererAssertTest[]            = L"renderer-assert-test";
+const char kRendererAssertTest[]            = "renderer-assert-test";
 
 // Causes the browser process to crash on startup.
-const wchar_t kBrowserCrashTest[]              = L"crash-test";
+const char kBrowserCrashTest[]              = "crash-test";
 
 // Causes the renderer process to crash on launch.
-const wchar_t kRendererCrashTest[]             = L"renderer-crash-test";
+const char kRendererCrashTest[]             = "renderer-crash-test";
 
 // Causes the renderer process to display a dialog on launch.
-const wchar_t kRendererStartupDialog[]         = L"renderer-startup-dialog";
+const char kRendererStartupDialog[]         = "renderer-startup-dialog";
 
 // Causes the plugin process to display a dialog on launch.
-const wchar_t kPluginStartupDialog[]           = L"plugin-startup-dialog";
+const char kPluginStartupDialog[]           = "plugin-startup-dialog";
 
 // Specifies a command that should be used to launch the plugin process.  Useful
 // for running the plugin process through purify or quantify.  Ex:
 //   --plugin-launcher="path\to\purify /Run=yes"
-const wchar_t kPluginLauncher[]                = L"plugin-launcher";
+const char kPluginLauncher[]                = "plugin-launcher";
 
 // The value of this switch tells the app to listen for and broadcast
 // testing-related messages on IPC channel with the given ID.
-const wchar_t kTestingChannelID[]              = L"testing-channel";
+const char kTestingChannelID[]              = "testing-channel";
 
 // The value of this switch specifies which page will be displayed
 // in newly-opened tabs.  We need this for testing purposes so
 // that the UI tests don't depend on what comes up for http://google.com.
-const wchar_t kHomePage[]                      = L"homepage";
+const char kHomePage[]                      = "homepage";
 
 // Causes the process to run as renderer instead of as browser.
-const wchar_t kRendererProcess[]               = L"renderer";
+const char kRendererProcess[]               = "renderer";
 
 // Causes the process to run as a renderer zygote.
-const wchar_t kZygoteProcess[]                 = L"zygote";
+const char kZygoteProcess[]                 = "zygote";
 
 // Path to the exe to run for the renderer and plugin subprocesses.
-const wchar_t kBrowserSubprocessPath[]         = L"browser-subprocess-path";
+const char kBrowserSubprocessPath[]         = "browser-subprocess-path";
 
 // Causes the process to run as a plugin subprocess.
-const wchar_t kPluginProcess[]                 = L"plugin";
+const char kPluginProcess[]                 = "plugin";
 
 // Causes the process to run as a worker subprocess.
-const wchar_t kWorkerProcess[]                 = L"worker";
+const char kWorkerProcess[]                 = "worker";
 
 // Causes the process to run as a NativeClient's sel_ldr subprocess.
-const wchar_t kNaClProcess[]                   = L"nacl";
+const char kNaClProcess[]                   = "nacl";
 
 // Causes the process to run as a utility subprocess.
-const wchar_t kUtilityProcess[]                = L"utility";
+const char kUtilityProcess[]                = "utility";
 
 // Causes the process to run as a profile import subprocess.
-const wchar_t kProfileImportProcess[]          = L"profile-import";
+const char kProfileImportProcess[]          = "profile-import";
 
 // Runs the renderer and plugins in the same process as the browser
-const wchar_t kSingleProcess[]                 = L"single-process";
+const char kSingleProcess[]                 = "single-process";
 
 // Runs each set of script-connected tabs (i.e., a BrowsingInstance) in its own
 // renderer process.  We default to using a renderer process for each
 // site instance (i.e., group of pages from the same registered domain with
 // script connections to each other).
-const wchar_t kProcessPerTab[]                 = L"process-per-tab";
+const char kProcessPerTab[]                 = "process-per-tab";
 
 // Runs a single process for each site (i.e., group of pages from the same
 // registered domain) the user visits.  We default to using a renderer process
 // for each site instance (i.e., group of pages from the same registered
 // domain with script connections to each other).
-const wchar_t kProcessPerSite[]                = L"process-per-site";
+const char kProcessPerSite[]                = "process-per-site";
 
 // Runs plugins inside the renderer process
-const wchar_t kInProcessPlugins[]              = L"in-process-plugins";
+const char kInProcessPlugins[]              = "in-process-plugins";
 
 // Runs the renderer outside the sandbox.
-const wchar_t kNoSandbox[]                     = L"no-sandbox";
+const char kNoSandbox[]                     = "no-sandbox";
 
 // Disables the alternate window station for the renderer.
-const wchar_t kDisableAltWinstation[]          = L"disable-winsta";
+const char kDisableAltWinstation[]          = "disable-winsta";
 
 // Runs the plugin processes inside the sandbox.
-const wchar_t kSafePlugins[]                   = L"safe-plugins";
+const char kSafePlugins[]                   = "safe-plugins";
 
 // Excludes these plugins from the plugin sandbox.
 // This is a comma-separated list of plugin library names.
-const wchar_t kTrustedPlugins[]                = L"trusted-plugins";
+const char kTrustedPlugins[]                = "trusted-plugins";
 
 // Runs the security test for the sandbox.
-const wchar_t kTestSandbox[]                   = L"test-sandbox";
+const char kTestSandbox[]                   = "test-sandbox";
 
 // Specifies the user data directory, which is where the browser will look
 // for all of its state.
-const wchar_t kUserDataDir[]                   = L"user-data-dir";
+const char kUserDataDir[]                   = "user-data-dir";
 
 // Specifies the plugin data directory, which is where plugins (Gears
 // specifically) will store its state.
-const wchar_t kPluginDataDir[]                 = L"plugin-data-dir";
+const char kPluginDataDir[]                 = "plugin-data-dir";
 
 // Use a specific disk cache location, rather than one derived from the
 // UserDatadir.
-const wchar_t kDiskCacheDir[]                  = L"disk-cache-dir";
+const char kDiskCacheDir[]                  = "disk-cache-dir";
 
 // Forces the maximum disk space to be used by the disk cache, in bytes.
-const wchar_t kDiskCacheSize[]                 = L"disk-cache-size";
+const char kDiskCacheSize[]                 = "disk-cache-size";
 
 // Forces the maximum disk space to be used by the media cache, in bytes.
-const wchar_t kMediaCacheSize[]                = L"media-cache-size";
+const char kMediaCacheSize[]                = "media-cache-size";
 
 // Whether the multiple profiles feature based on the user-data-dir flag is
 // enabled or not.
-const wchar_t kEnableUserDataDirProfiles[]     = L"enable-udd-profiles";
+const char kEnableUserDataDirProfiles[]     = "enable-udd-profiles";
 
 // Specifies the path to the user data folder for the parent profile.
-const wchar_t kParentProfile[]                 = L"parent-profile";
+const char kParentProfile[]                 = "parent-profile";
 
 // Specifies that the associated value should be launched in "application" mode.
-const wchar_t kApp[]                           = L"app";
+const char kApp[]                           = "app";
 
 // Specifies if the dom_automation_controller_ needs to be bound in the
 // renderer. This binding happens on per-frame basis and hence can potentially
 // be a performance bottleneck. One should only enable it when automating
 // dom based tests.
-const wchar_t kDomAutomationController[]       = L"dom-automation";
+const char kDomAutomationController[]       = "dom-automation";
 
 // Tells the plugin process the path of the plugin to load
-const wchar_t kPluginPath[]                    = L"plugin-path";
+const char kPluginPath[]                    = "plugin-path";
 
 // A string used to override the default user agent with a custom one.
-const wchar_t kUserAgent[]                     = L"user-agent";
+const char kUserAgent[]                     = "user-agent";
 
 // Specifies the flags passed to JS engine
-const wchar_t kJavaScriptFlags[]               = L"js-flags";
+const char kJavaScriptFlags[]               = "js-flags";
 
 // The Country we should use.  This is normally obtained from the operating
 // system during first run and cached in the preferences afterwards.  This is a
 // string value, the 2 letter code from ISO 3166-1.
-const wchar_t kCountry[]                       = L"country";
+const char kCountry[]                       = "country";
 
 // Will add kWaitForDebugger to every child processes. If a value is passed, it
 // will be used as a filter to determine if the child process should have the
 // kWaitForDebugger flag passed on or not.
-const wchar_t kWaitForDebuggerChildren[]       = L"wait-for-debugger-children";
+const char kWaitForDebuggerChildren[]       = "wait-for-debugger-children";
 
 // Will filter log messages to show only the messages that are prefixed
 // with the specified value
-const wchar_t kLogFilterPrefix[]               = L"log-filter-prefix";
+const char kLogFilterPrefix[]               = "log-filter-prefix";
 
 // Force logging to be enabled.  Logging is disabled by default in release
 // builds.
-const wchar_t kEnableLogging[]                 = L"enable-logging";
+const char kEnableLogging[]                 = "enable-logging";
 
 // Force logging to be disabled.  Logging is enabled by default in debug
 // builds.
-const wchar_t kDisableLogging[]                = L"disable-logging";
+const char kDisableLogging[]                = "disable-logging";
 
 // Sets the minimum log level. Valid values are from 0 to 3:
 // INFO = 0, WARNING = 1, LOG_ERROR = 2, LOG_FATAL = 3.
-const wchar_t kLoggingLevel[]                  = L"log-level";
+const char kLoggingLevel[]                  = "log-level";
 
 // Make plugin processes log their sent and received messages to LOG(INFO).
-const wchar_t kLogPluginMessages[]             = L"log-plugin-messages";
+const char kLogPluginMessages[]             = "log-plugin-messages";
 
 // Dump any accumualted histograms to the log when browser terminates (requires
 // logging to be enabled to really do anything).  Used by developers and test
 // scripts.
-const wchar_t kDumpHistogramsOnExit[]          = L"dump-histograms-on-exit";
+const char kDumpHistogramsOnExit[]          = "dump-histograms-on-exit";
 
 // enable remote debug / automation shell on the specified port
-const wchar_t kRemoteShellPort[]               = L"remote-shell-port";
+const char kRemoteShellPort[]               = "remote-shell-port";
 
 // Runs un-installation steps that were done by chrome first-run.
-const wchar_t kUninstall[]                     = L"uninstall";
+const char kUninstall[]                     = "uninstall";
 
 // Number of entries to show in the omnibox popup.
-const wchar_t kOmniBoxPopupCount[]             = L"omnibox-popup-count";
+const char kOmniBoxPopupCount[]             = "omnibox-popup-count";
 
 // The value of this switch tells the app to listen for and broadcast
 // automation-related messages on IPC channel with the given ID.
-const wchar_t kAutomationClientChannelID[]     = L"automation-channel";
+const char kAutomationClientChannelID[]     = "automation-channel";
 
 // Indicates the last session should be restored on startup. This overrides
 // the preferences value and is primarily intended for testing. The value of
 // this switch is the number of tabs to wait until loaded before
 // 'load completed' is sent to the ui_test.
-const wchar_t kRestoreLastSession[]            = L"restore-last-session";
+const char kRestoreLastSession[]            = "restore-last-session";
 
 // Chrome supports a playback and record mode.  Record mode saves *everything*
 // to the cache.  Playback mode reads data exclusively from the cache.  This
 // allows us to record a session into the cache and then replay it at will.
-const wchar_t kRecordMode[]                    = L"record-mode";
-const wchar_t kPlaybackMode[]                  = L"playback-mode";
+const char kRecordMode[]                    = "record-mode";
+const char kPlaybackMode[]                  = "playback-mode";
 
 // Don't record/playback events when using record & playback.
-const wchar_t kNoEvents[]                      = L"no-events";
+const char kNoEvents[]                      = "no-events";
 
 // Support a separate switch that enables the v8 playback extension.
 // The extension causes javascript calls to Date.now() and Math.random()
 // to return consistent values, such that subsequent loads of the same
 // page will result in consistent js-generated data and XHR requests.
 // Pages may still be able to generate inconsistent data from plugins.
-const wchar_t kNoJsRandomness[]                = L"no-js-randomness";
+const char kNoJsRandomness[]                = "no-js-randomness";
 
 // Make Windows happy by allowing it to show "Enable access to this program"
 // checkbox in Add/Remove Programs->Set Program Access and Defaults. This
 // only shows an error box because the only way to hide Chrome is by
 // uninstalling it.
-const wchar_t kHideIcons[]                     = L"hide-icons";
+const char kHideIcons[]                     = "hide-icons";
 
-const wchar_t kShowIcons[]                     = L"show-icons";
+const char kShowIcons[]                     = "show-icons";
 
 // Make Chrome default browser
-const wchar_t kMakeDefaultBrowser[]            = L"make-default-browser";
+const char kMakeDefaultBrowser[]            = "make-default-browser";
 
 // Use a specified proxy server, overrides system settings. This switch only
 // affects HTTP and HTTPS requests.
-const wchar_t kProxyServer[]                   = L"proxy-server";
+const char kProxyServer[]                   = "proxy-server";
 
 // Don't use a proxy server, always make direct connections. Overrides any
 // other proxy server flags that are passed.
-const wchar_t kNoProxyServer[]                 = L"no-proxy-server";
+const char kNoProxyServer[]                 = "no-proxy-server";
 
 // Specify a list of hosts for whom we bypass proxy settings and use direct
 // connections. Ignored if --proxy-auto-detect or --no-proxy-server are
 // also specified.
 // TODO(robertshield): Specify host format.
-const wchar_t kProxyBypassList[]               = L"proxy-bypass-list";
+const char kProxyBypassList[]               = "proxy-bypass-list";
 
 // Force proxy auto-detection.
-const wchar_t kProxyAutoDetect[]               = L"proxy-auto-detect";
+const char kProxyAutoDetect[]               = "proxy-auto-detect";
 
 // Use the pac script at the given URL
-const wchar_t kProxyPacUrl[]                   = L"proxy-pac-url";
+const char kProxyPacUrl[]                   = "proxy-pac-url";
 
 // Use WinHTTP to fetch and evaluate PAC scripts. Otherwise the default is
 // to use Chromium's network stack to fetch, and V8 to evaluate.
-const wchar_t kWinHttpProxyResolver[]          = L"winhttp-proxy-resolver";
+const char kWinHttpProxyResolver[]          = "winhttp-proxy-resolver";
 
 // Chrome will support prefetching of DNS information.  Until this becomes
 // the default, we'll provide a command line switch.
-extern const wchar_t kDnsLogDetails[]          = L"dns-log-details";
-extern const wchar_t kDnsPrefetchDisable[]     = L"dns-prefetch-disable";
+extern const char kDnsLogDetails[]          = "dns-log-details";
+extern const char kDnsPrefetchDisable[]     = "dns-prefetch-disable";
 
 // Enables support to debug printing subsystem.
-const wchar_t kDebugPrint[]                    = L"debug-print";
+const char kDebugPrint[]                    = "debug-print";
 
 // Prints the pages on the screen.
-const wchar_t kPrint[] = L"print";
+const char kPrint[] = "print";
 
 // Browser flag to disable the web inspector for all renderers.
-const wchar_t kDisableDevTools[]               = L"disable-dev-tools";
+const char kDisableDevTools[]               = "disable-dev-tools";
 
 // Enable web inspector for all windows, even if they're part of the browser.
 // Allows us to use our dev tools to debug browser windows itself.
-const wchar_t kAlwaysEnableDevTools[]          = L"always-enable-dev-tools";
+const char kAlwaysEnableDevTools[]          = "always-enable-dev-tools";
 
 // Enable experimental timeline API.
-const wchar_t kEnableExtensionTimelineApi[]    =
-    L"enable-extension-timeline-api";
+const char kEnableExtensionTimelineApi[]    =
+    "enable-extension-timeline-api";
 
 // Used to set the value of SessionRestore::num_tabs_to_load_. See
 // session_restore.h for details.
-const wchar_t kTabCountToLoadOnSessionRestore[]=
-    L"tab-count-to-load-on-session-restore";
+const char kTabCountToLoadOnSessionRestore[]=
+    "tab-count-to-load-on-session-restore";
 
 // Enable dynamic loading of the Memory Profiler DLL, which will trace
 // all memory allocations during the run.
-const wchar_t kMemoryProfiling[]               = L"memory-profile";
+const char kMemoryProfiling[]               = "memory-profile";
 
 // Adds a "Purge memory" button to the Task Manager, which tries to dump as much
 // memory as possible.  This is mostly useful for testing how well the
 // MemoryPurger functionality (which is normally triggered on Suspend) works.
 //
 // NOTE: This is only implemented for Views.
-const wchar_t kPurgeMemoryButton[]             = L"purge-memory-button";
+const char kPurgeMemoryButton[]             = "purge-memory-button";
 
 // By default, cookies are not allowed on file://. They are needed in for
 // testing, for example page cycler and layout tests.  See bug 1157243.
-const wchar_t kEnableFileCookies[]             = L"enable-file-cookies";
+const char kEnableFileCookies[]             = "enable-file-cookies";
 
 // Start the browser maximized, regardless of any previous settings.
-const wchar_t kStartMaximized[]                = L"start-maximized";
+const char kStartMaximized[]                = "start-maximized";
 
 // Spawn threads to watch for excessive delays in specified message loops.
 // User should set breakpoints on Alarm() to examine problematic thread.
 // Usage:   -enable-watchdog=[ui][io]
 // Order of the listed sub-arguments does not matter.
-const wchar_t kEnableWatchdog[]                = L"enable-watchdog";
+const char kEnableWatchdog[]                = "enable-watchdog";
 
 // Display the First Run experience when the browser is started, regardless of
 // whether or not it's actually the first run.
-const wchar_t kFirstRun[]                      = L"first-run";
+const char kFirstRun[]                      = "first-run";
 
 // Bypass the First Run experience when the browser is started, regardless of
 // whether or not it's actually the first run. Overrides kFirstRun in case
 // you're for some reason tempted to pass them both.
-const wchar_t kNoFirstRun[]                    = L"no-first-run";
+const char kNoFirstRun[]                    = "no-first-run";
 
 #if defined(OS_POSIX)
 // Bypass the error dialog when the profile lock couldn't be attained.
 // This switch is used during automated testing.
-const wchar_t kNoProcessSingletonDialog[]      = L"no-process-singleton-dialog";
+const char kNoProcessSingletonDialog[]      = "no-process-singleton-dialog";
 #endif
 
 // Enable histograming of tasks served by MessageLoop. See about:histograms/Loop
 // for results, which show frequency of messages on each thread, including APC
 // count, object signalling count, etc.
-const wchar_t kMessageLoopHistogrammer[]       = L"message-loop-histogrammer";
+const char kMessageLoopHistogrammer[]       = "message-loop-histogrammer";
 
 // Perform importing from another browser. The value associated with this
 // setting encodes the target browser and what items to import.
-const wchar_t kImport[]                        = L"import";
+const char kImport[]                        = "import";
 
 // Change the DCHECKS to dump memory and continue instead of displaying error
 // dialog. This is valid only in Release mode when --enable-dcheck is
 // specified.
-const wchar_t kSilentDumpOnDCHECK[]            = L"silent-dump-on-dcheck";
+const char kSilentDumpOnDCHECK[]            = "silent-dump-on-dcheck";
 
 // Normally when the user attempts to navigate to a page that was the result of
 // a post we prompt to make sure they want to. This switch may be used to
 // disable that check. This switch is used during automated testing.
-const wchar_t kDisablePromptOnRepost[]         = L"disable-prompt-on-repost";
+const char kDisablePromptOnRepost[]         = "disable-prompt-on-repost";
 
 // Disable pop-up blocking.
-const wchar_t kDisablePopupBlocking[]          = L"disable-popup-blocking";
+const char kDisablePopupBlocking[]          = "disable-popup-blocking";
 
 // Don't execute JavaScript (browser JS like the new tab page still runs).
-const wchar_t kDisableJavaScript[]             = L"disable-javascript";
+const char kDisableJavaScript[]             = "disable-javascript";
 
 // Don't enforce the same-origin policy.  (Used by people testing their sites.)
-const wchar_t kDisableWebSecurity[]            = L"disable-web-security";
+const char kDisableWebSecurity[]            = "disable-web-security";
 
 // Prevent Java from running.
-const wchar_t kDisableJava[]                   = L"disable-java";
+const char kDisableJava[]                   = "disable-java";
 
 // Prevent plugins from running.
-const wchar_t kDisablePlugins[]                = L"disable-plugins";
+const char kDisablePlugins[]                = "disable-plugins";
 
 // Prevent images from loading.
-const wchar_t kDisableImages[]                 = L"disable-images";
+const char kDisableImages[]                 = "disable-images";
 
 // Enable remote web font support. SVG font should always work whether
 // this option is specified or not.
-const wchar_t kEnableRemoteFonts[]             = L"enable-remote-fonts";
+const char kEnableRemoteFonts[]             = "enable-remote-fonts";
 
 // Use the low fragmentation heap for the CRT.
-const wchar_t kUseLowFragHeapCrt[]             = L"use-lf-heap";
+const char kUseLowFragHeapCrt[]             = "use-lf-heap";
 
 // Runs the Native Client inside the renderer process.
-const wchar_t kInternalNaCl[]                  = L"internal-nacl";
+const char kInternalNaCl[]                  = "internal-nacl";
 
 #ifndef NDEBUG
 // Debug only switch to specify which gears plugin dll to load.
-const wchar_t kGearsPluginPathOverride[]       = L"gears-plugin-path";
+const char kGearsPluginPathOverride[]       = "gears-plugin-path";
 #endif
 
 // Enable the fastback page cache.
-const wchar_t kEnableFastback[]                = L"enable-fastback";
+const char kEnableFastback[]                = "enable-fastback";
 
 // Disable syncing bookmarks to a Google Account.
-const wchar_t kDisableSync[]                   = L"disable-sync";
+const char kDisableSync[]                   = "disable-sync";
 
 // Use the SyncerThread implementation that matches up with the old pthread
 // impl semantics, but using Chrome synchronization primitives.  The only
 // difference between this and the default is that we now have no timeout on
 // Stop().  Should only use if you experience problems with the default.
-const wchar_t kSyncerThreadTimedStop[]         = L"syncer-thread-timed-stop";
+const char kSyncerThreadTimedStop[]         = "syncer-thread-timed-stop";
 
 // Enable support for SDCH filtering (dictionary based expansion of content).
 // Optional argument is *the* only domain name that will have SDCH suppport.
 // Default is  "-enable-sdch" to advertise SDCH on all domains.
 // Sample usage with argument: "-enable-sdch=.google.com"
 // SDCH is currently only supported server-side for searches on google.com.
-const wchar_t kSdchFilter[]                    = L"enable-sdch";
+const char kSdchFilter[]                    = "enable-sdch";
 
 // Enable user script support.
-const wchar_t kEnableUserScripts[]             = L"enable-user-scripts";
+const char kEnableUserScripts[]             = "enable-user-scripts";
 
 // Disable extensions.
-const wchar_t kDisableExtensions[]             = L"disable-extensions";
+const char kDisableExtensions[]             = "disable-extensions";
 
 // Frequency in seconds for Extensions auto-update.
-const wchar_t kExtensionsUpdateFrequency[]     = L"extensions-update-frequency";
+const char kExtensionsUpdateFrequency[]     = "extensions-update-frequency";
 
 // Load an extension from the specified directory.
-const wchar_t kLoadExtension[]                 = L"load-extension";
+const char kLoadExtension[]                 = "load-extension";
 
 // Package an extension to a .crx installable file from a given directory.
-const wchar_t kPackExtension[]                 = L"pack-extension";
+const char kPackExtension[]                 = "pack-extension";
 
 // Optional PEM private key is to use in signing packaged .crx.
-const wchar_t kPackExtensionKey[]              = L"pack-extension-key";
+const char kPackExtensionKey[]              = "pack-extension-key";
 
 // Show extensions on top with toolbar.
-const wchar_t kShowExtensionsOnTop[]           = L"show-extensions-on-top";
+const char kShowExtensionsOnTop[]           = "show-extensions-on-top";
 
 // Load an NPAPI plugin from the specified path.
-const wchar_t kLoadPlugin[]                    = L"load-plugin";
+const char kLoadPlugin[]                    = "load-plugin";
 
 // directory to locate user scripts in as an over-ride of the default
-const wchar_t kUserScriptsDir[]                = L"user-scripts-dir";
+const char kUserScriptsDir[]                = "user-scripts-dir";
 
 // Causes the browser to launch directly in incognito mode.
-const wchar_t kIncognito[]                     = L"incognito";
+const char kIncognito[]                     = "incognito";
 
 // Turns on the accessibility in the renderer.  Off by default until
 // http://b/issue?id=1432077 is fixed.
-const wchar_t kEnableRendererAccessibility[]   =
-    L"enable-renderer-accessibility";
+const char kEnableRendererAccessibility[]   =
+    "enable-renderer-accessibility";
 
 // Pass the name of the current running automated test to Chrome.
-const wchar_t kTestName[]                      = L"test-name";
+const char kTestName[]                      = "test-name";
 
 // On POSIX only: the contents of this flag are prepended to the renderer
 // command line. Useful values might be "valgrind" or "xterm -e gdb --args".
-const wchar_t kRendererCmdPrefix[]             = L"renderer-cmd-prefix";
+const char kRendererCmdPrefix[]             = "renderer-cmd-prefix";
 
 // On POSIX only: the contents of this flag are prepended to the utility
 // process command line. Useful values might be "valgrind" or "xterm -e gdb
 // --args".
-const wchar_t kUtilityCmdPrefix[]              = L"utility-cmd-prefix";
+const char kUtilityCmdPrefix[]              = "utility-cmd-prefix";
 
 // On Windows only: use the old WinInet-based ftp implemetation.
-const wchar_t kWininetFtp[]                    = L"wininet-ftp";
+const char kWininetFtp[]                    = "wininet-ftp";
 
 // Enable Native Web Worker support
-const wchar_t kEnableNativeWebWorkers[]        = L"enable-native-web-workers";
+const char kEnableNativeWebWorkers[]        = "enable-native-web-workers";
 
 // Causes the worker process allocation to use as many processes as cores.
-const wchar_t kWebWorkerProcessPerCore[]       = L"web-worker-process-per-core";
+const char kWebWorkerProcessPerCore[]       = "web-worker-process-per-core";
 
 // Causes workers to run together in one process, depending on their domains.
 // Note this is duplicated in webworkerclient_impl.cc
-const wchar_t kWebWorkerShareProcesses[]       = L"web-worker-share-processes";
+const char kWebWorkerShareProcesses[]       = "web-worker-share-processes";
 
 // Enables the bookmark menu.
-const wchar_t kBookmarkMenu[]                  = L"bookmark-menu";
+const char kBookmarkMenu[]                  = "bookmark-menu";
 
 // Enables experimental features for Spellchecker. Right now, the first
 // experimental feature is auto spell correct, which corrects words which are
@@ -468,11 +468,11 @@ const wchar_t kBookmarkMenu[]                  = L"bookmark-menu";
 // 1 - Allow multiple spellcheckers to work simultaneously.
 // 2 - Allow automatic detection of spell check language.
 // TODO(sidchat): Implement the above fetaures to work under this flag.
-const wchar_t kExperimentalSpellcheckerFeatures[] =
-    L"experimental-spellchecker-features";
+const char kExperimentalSpellcheckerFeatures[] =
+    "experimental-spellchecker-features";
 
 // Enables StatsTable, logging statistics to a global named shared memory table.
-const wchar_t kEnableStatsTable[]              = L"enable-stats-table";
+const char kEnableStatsTable[]              = "enable-stats-table";
 
 // Replaces the audio IPC layer for <audio> and <video> with a mock audio
 // device, useful when using remote desktop or machines without sound cards.
@@ -480,14 +480,14 @@ const wchar_t kEnableStatsTable[]              = L"enable-stats-table";
 //
 // TODO(scherkus): remove --disable-audio when we have a proper fallback
 // mechanism.
-const wchar_t kDisableAudio[]                  = L"disable-audio";
+const char kDisableAudio[]                  = "disable-audio";
 
 // Replaces the buffered data source for <audio> and <video> with a simplified
 // resource loader that downloads the entire resource into memory.
 //
 // TODO(scherkus): remove --simple-data-source when our media resource loading
 // is cleaned up and playback testing completed.
-const wchar_t kSimpleDataSource[]              = L"simple-data-source";
+const char kSimpleDataSource[]              = "simple-data-source";
 
 // Some field tests may rendomized in the browser, and the randomly selected
 // outcome needs to be propogated to the renderer.  For instance, this is used
@@ -499,138 +499,137 @@ const wchar_t kSimpleDataSource[]              = L"simple-data-source";
 // persistent representation generated by field_trial.cc and later decoded, is a
 // list of name and value pairs, separated by slashes. See field trial.cc for
 // current details.
-const wchar_t kForceFieldTestNameAndValue[]    = L"force-fieldtest";
+const char kForceFieldTestNameAndValue[]    = "force-fieldtest";
 
 // Allows the new tab page resource to be loaded from a local HTML file. This
 // should be a path to the HTML file that you want to use for the new tab page.
 // It is used for manually testing new versions of the new tab page only,
 // performance will be poor.
-const wchar_t kNewTabPage[]                    = L"new-tab-page";
+const char kNewTabPage[]                    = "new-tab-page";
 
 // Enables the backend service for web resources, used in the new tab page for
 // loading tips and recommendations from a JSON feed.
-const wchar_t kDisableWebResources[]           = L"disable-web-resources";
+const char kDisableWebResources[]           = "disable-web-resources";
 
 // Whether we should prevent the new tab page from showing the first run
 // notification.
-const wchar_t kDisableNewTabFirstRun[]         = L"disable-new-tab-first-run";
+const char kDisableNewTabFirstRun[]         = "disable-new-tab-first-run";
 
 // Disables the default browser check. Useful for UI/browser tests where we want
 // to avoid having the default browser info-bar displayed.
-const wchar_t kNoDefaultBrowserCheck[]         = L"no-default-browser-check";
+const char kNoDefaultBrowserCheck[]         = "no-default-browser-check";
 
 // Enables the Privacy Blacklist with the specified data file.
 // The file contains data from all imported blacklists.
-const wchar_t kPrivacyBlacklist[]              = L"privacy-blacklist";
+const char kPrivacyBlacklist[]              = "privacy-blacklist";
 
 // Enables the benchmarking extensions.
-const wchar_t kEnableBenchmarking[]            = L"enable-benchmarking";
+const char kEnableBenchmarking[]            = "enable-benchmarking";
 
 // The prefix used when starting the zygote process. (i.e. 'gdb --args')
-const wchar_t kZygoteCmdPrefix[]               = L"zygote-cmd-prefix";
+const char kZygoteCmdPrefix[]               = "zygote-cmd-prefix";
 
 // Enables using ThumbnailStore instead of ThumbnailDatabase for setting and
 // getting thumbnails for the new tab page.
-const wchar_t kThumbnailStore[]                = L"thumbnail-store";
+const char kThumbnailStore[]                = "thumbnail-store";
 
 // Experimental. Shows a dialog asking the user to try chrome. This flag
 // is to be used only by the upgrade process.
-const wchar_t kTryChromeAgain[]                = L"try-chrome-again";
+const char kTryChromeAgain[]                = "try-chrome-again";
 
 // The file descriptor limit is set to the value of this switch, subject to the
 // OS hard limits. Useful for testing that file descriptor exhaustion is handled
 // gracefully.
-const wchar_t kFileDescriptorLimit[]           = L"file-descriptor-limit";
+const char kFileDescriptorLimit[]           = "file-descriptor-limit";
 
 // On Windows, converts the page to the currently-installed monitor profile.
 // This does NOT enable color management for images. The source is still assumed
 // to be sRGB.
-const wchar_t kEnableMonitorProfile[]          = L"enable-monitor-profile";
+const char kEnableMonitorProfile[]          = "enable-monitor-profile";
 
 // Disable WebKit's XSSAuditor.  The XSSAuditor mitigates reflective XSS.
-const wchar_t kDisableXSSAuditor[]             = L"disable-xss-auditor";
+const char kDisableXSSAuditor[]             = "disable-xss-auditor";
 
 #if defined(OS_POSIX)
 // A flag, generated internally by Chrome for renderer and other helper process
 // command lines on Linux and Mac.  It tells the helper process to enable crash
 // dumping and reporting, because helpers cannot access the profile or other
 // files needed to make this decision.
-const wchar_t kEnableCrashReporter[]           = L"enable-crash-reporter";
+const char kEnableCrashReporter[]           = "enable-crash-reporter";
 #endif
 
 // Enables the new Tabstrip on Windows.
-const wchar_t kEnableTabtastic2[]              = L"enable-tabtastic2";
+const char kEnableTabtastic2[]              = "enable-tabtastic2";
 
 // Number of tabs to pin on startup. This is not use if session restore is
 // enabled.
-const wchar_t kPinnedTabCount[]                = L"pinned-tab-count";
+const char kPinnedTabCount[]                = "pinned-tab-count";
 
 // Enables the showing of an info-bar instructing user they can search directly
 // from the omnibox.
-const wchar_t kSearchInOmniboxHint[]           = L"search-in-omnibox-hint";
+const char kSearchInOmniboxHint[]           = "search-in-omnibox-hint";
 
 // Enable local storage.  Still buggy.
-const wchar_t kEnableLocalStorage[]            = L"enable-local-storage";
+const char kEnableLocalStorage[]            = "enable-local-storage";
 
 // Enable session storage.  Still buggy.
-const wchar_t kEnableSessionStorage[]          = L"enable-session-storage";
+const char kEnableSessionStorage[]          = "enable-session-storage";
 
 // Allows debugging of sandboxed processes (see zygote_main_linux.cc).
-const wchar_t kAllowSandboxDebugging[]         = L"allow-sandbox-debugging";
+const char kAllowSandboxDebugging[]         = "allow-sandbox-debugging";
 
 #if defined(OS_MACOSX)
 // Cause the OS X sandbox write to syslog every time an access to a resource
 // is denied by the sandbox.
-const wchar_t kEnableSandboxLogging[]         = L"enable-sandbox-logging";
+const char kEnableSandboxLogging[]          = "enable-sandbox-logging";
 #endif
 
 // Enable the seccomp sandbox (Linux only)
-const wchar_t kEnableSeccompSandbox[]          = L"enable-seccomp-sandbox";
+const char kEnableSeccompSandbox[]          = "enable-seccomp-sandbox";
 
 // Triggers a pletora of diagnostic modes.
-const wchar_t kDiagnostics[]                   = L"diagnostics";
+const char kDiagnostics[]                   = "diagnostics";
 
 // Disables the custom JumpList on Windows 7.
-const wchar_t kDisableCustomJumpList[]         = L"disable-custom-jumplist";
+const char kDisableCustomJumpList[]         = "disable-custom-jumplist";
 
 // Enables HTML5 DB support.
-const wchar_t kEnableDatabases[]               = L"enable-databases";
+const char kEnableDatabases[]               = "enable-databases";
 
 // Enable ApplicationCache. Still mostly not there.
-const wchar_t kEnableApplicationCache[]        = L"enable-application-cache";
+const char kEnableApplicationCache[]        = "enable-application-cache";
 
 // Override the default server used for profile sync.
-const wchar_t kSyncServiceURL[]                = L"sync-url";
+const char kSyncServiceURL[]                = "sync-url";
 
 #if defined(OS_CHROMEOS)
 // The name of the pipe over which the Chrome OS login manager will send
 // single-sign-on cookies.
-const wchar_t kCookiePipe[]                    = L"cookie-pipe";
+const char kCookiePipe[]                    = "cookie-pipe";
 
 // Enable the redirection of viewable document requests to the Google
 // Document Viewer.
-const wchar_t kEnableGView[]                   = L"enable-gview";
+const char kEnableGView[]                   = "enable-gview";
 #endif
 
 // Enable experimental support for cached byte-ranges.
-const wchar_t kEnableByteRangeSupport[]        = L"enable-byte-range-support";
+const char kEnableByteRangeSupport[]        = "enable-byte-range-support";
 
 // Explicitly allow additional ports using a comma separated list of port
 // numbers.
-const wchar_t kExplicitlyAllowedPorts[]        = L"explicitly-allowed-ports";
+const char kExplicitlyAllowedPorts[]        = "explicitly-allowed-ports";
 
 // Activate (make foreground) myself on launch.  Helpful when Chrome
 // is launched on the command line (e.g. by Selenium).  Only needed on Mac.
-const wchar_t kActivateOnLaunch[]              = L"activate-on-launch";
+const char kActivateOnLaunch[]              = "activate-on-launch";
 
 // Enable experimental WebGL support.
-const wchar_t kEnableExperimentalWebGL[]       = L"enable-webgl";
+const char kEnableExperimentalWebGL[]       = "enable-webgl";
 
 // Enabled desktop notifications.
-const wchar_t kEnableDesktopNotifications[]    =
-    L"enable-desktop-notifications";
+const char kEnableDesktopNotifications[]    = "enable-desktop-notifications";
 
 // Enable Web Sockets support.
-const wchar_t kEnableWebSockets[] = L"enable-web-sockets";
+const char kEnableWebSockets[] = "enable-web-sockets";
 
 }  // namespace switches
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 85fa7be..8c9ed0b 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -12,248 +12,248 @@
 
 namespace switches {
 
-extern const wchar_t kDisableHangMonitor[];
-extern const wchar_t kDisableMetrics[];
-extern const wchar_t kMetricsRecordingOnly[];
-extern const wchar_t kBrowserAssertTest[];
-extern const wchar_t kRendererAssertTest[];
-extern const wchar_t kBrowserCrashTest[];
-extern const wchar_t kRendererCrashTest[];
-extern const wchar_t kRendererStartupDialog[];
-extern const wchar_t kPluginStartupDialog[];
-extern const wchar_t kPluginLauncher[];
-
-extern const wchar_t kTestingChannelID[];
-extern const wchar_t kHomePage[];
-extern const wchar_t kRendererProcess[];
-extern const wchar_t kZygoteProcess[];
-extern const wchar_t kBrowserSubprocessPath[];
-extern const wchar_t kPluginProcess[];
-extern const wchar_t kWorkerProcess[];
-extern const wchar_t kNaClProcess[];
-extern const wchar_t kUtilityProcess[];
-extern const wchar_t kProfileImportProcess[];
-extern const wchar_t kSingleProcess[];
-extern const wchar_t kProcessPerTab[];
-extern const wchar_t kProcessPerSite[];
-extern const wchar_t kInProcessPlugins[];
-extern const wchar_t kNoSandbox[];
-extern const wchar_t kDisableAltWinstation[];
-extern const wchar_t kSafePlugins[];
-extern const wchar_t kTrustedPlugins[];
-extern const wchar_t kTestSandbox[];
-extern const wchar_t kUserDataDir[];
-extern const wchar_t kPluginDataDir[];
-extern const wchar_t kDiskCacheDir[];
-extern const wchar_t kDiskCacheSize[];
-extern const wchar_t kMediaCacheSize[];
-extern const wchar_t kEnableUserDataDirProfiles[];
-extern const wchar_t kParentProfile[];
-extern const wchar_t kApp[];
-extern const wchar_t kDomAutomationController[];
-extern const wchar_t kPluginPath[];
-extern const wchar_t kUserAgent[];
-extern const wchar_t kJavaScriptFlags[];
-extern const wchar_t kCountry[];
-extern const wchar_t kWaitForDebuggerChildren[];
-
-extern const wchar_t kLogFilterPrefix[];
-extern const wchar_t kEnableLogging[];
-extern const wchar_t kLoggingLevel[];
-extern const wchar_t kLogPluginMessages[];
-
-extern const wchar_t kDumpHistogramsOnExit[];
-extern const wchar_t kDisableLogging[];
-extern const wchar_t kRemoteShellPort[];
-extern const wchar_t kUninstall[];
-extern const wchar_t kOmniBoxPopupCount[];
-
-extern const wchar_t kAutomationClientChannelID[];
-
-extern const wchar_t kRestoreLastSession[];
-
-extern const wchar_t kRecordMode[];
-extern const wchar_t kPlaybackMode[];
-extern const wchar_t kNoEvents[];
-extern const wchar_t kNoJsRandomness[];
-
-extern const wchar_t kHideIcons[];
-extern const wchar_t kShowIcons[];
-extern const wchar_t kMakeDefaultBrowser[];
-
-extern const wchar_t kProxyServer[];
-extern const wchar_t kNoProxyServer[];
-extern const wchar_t kProxyBypassList[];
-extern const wchar_t kProxyAutoDetect[];
-extern const wchar_t kProxyPacUrl[];
-extern const wchar_t kWinHttpProxyResolver[];
-extern const wchar_t kDebugPrint[];
-extern const wchar_t kPrint[];
-
-extern const wchar_t kDnsLogDetails[];
-extern const wchar_t kDnsPrefetchDisable[];
-
-extern const wchar_t kDisableDevTools[];
-extern const wchar_t kAlwaysEnableDevTools[];
-extern const wchar_t kEnableExtensionTimelineApi[];
-
-extern const wchar_t kTabCountToLoadOnSessionRestore[];
-
-extern const wchar_t kMemoryProfiling[];
-extern const wchar_t kPurgeMemoryButton[];
-
-extern const wchar_t kEnableFileCookies[];
-
-extern const wchar_t kStartMaximized[];
-
-extern const wchar_t kEnableWatchdog[];
-
-extern const wchar_t kFirstRun[];
-
-extern const wchar_t kNoFirstRun[];
+extern const char kDisableHangMonitor[];
+extern const char kDisableMetrics[];
+extern const char kMetricsRecordingOnly[];
+extern const char kBrowserAssertTest[];
+extern const char kRendererAssertTest[];
+extern const char kBrowserCrashTest[];
+extern const char kRendererCrashTest[];
+extern const char kRendererStartupDialog[];
+extern const char kPluginStartupDialog[];
+extern const char kPluginLauncher[];
+
+extern const char kTestingChannelID[];
+extern const char kHomePage[];
+extern const char kRendererProcess[];
+extern const char kZygoteProcess[];
+extern const char kBrowserSubprocessPath[];
+extern const char kPluginProcess[];
+extern const char kWorkerProcess[];
+extern const char kNaClProcess[];
+extern const char kUtilityProcess[];
+extern const char kProfileImportProcess[];
+extern const char kSingleProcess[];
+extern const char kProcessPerTab[];
+extern const char kProcessPerSite[];
+extern const char kInProcessPlugins[];
+extern const char kNoSandbox[];
+extern const char kDisableAltWinstation[];
+extern const char kSafePlugins[];
+extern const char kTrustedPlugins[];
+extern const char kTestSandbox[];
+extern const char kUserDataDir[];
+extern const char kPluginDataDir[];
+extern const char kDiskCacheDir[];
+extern const char kDiskCacheSize[];
+extern const char kMediaCacheSize[];
+extern const char kEnableUserDataDirProfiles[];
+extern const char kParentProfile[];
+extern const char kApp[];
+extern const char kDomAutomationController[];
+extern const char kPluginPath[];
+extern const char kUserAgent[];
+extern const char kJavaScriptFlags[];
+extern const char kCountry[];
+extern const char kWaitForDebuggerChildren[];
+
+extern const char kLogFilterPrefix[];
+extern const char kEnableLogging[];
+extern const char kLoggingLevel[];
+extern const char kLogPluginMessages[];
+
+extern const char kDumpHistogramsOnExit[];
+extern const char kDisableLogging[];
+extern const char kRemoteShellPort[];
+extern const char kUninstall[];
+extern const char kOmniBoxPopupCount[];
+
+extern const char kAutomationClientChannelID[];
+
+extern const char kRestoreLastSession[];
+
+extern const char kRecordMode[];
+extern const char kPlaybackMode[];
+extern const char kNoEvents[];
+extern const char kNoJsRandomness[];
+
+extern const char kHideIcons[];
+extern const char kShowIcons[];
+extern const char kMakeDefaultBrowser[];
+
+extern const char kProxyServer[];
+extern const char kNoProxyServer[];
+extern const char kProxyBypassList[];
+extern const char kProxyAutoDetect[];
+extern const char kProxyPacUrl[];
+extern const char kWinHttpProxyResolver[];
+extern const char kDebugPrint[];
+extern const char kPrint[];
+
+extern const char kDnsLogDetails[];
+extern const char kDnsPrefetchDisable[];
+
+extern const char kDisableDevTools[];
+extern const char kAlwaysEnableDevTools[];
+extern const char kEnableExtensionTimelineApi[];
+
+extern const char kTabCountToLoadOnSessionRestore[];
+
+extern const char kMemoryProfiling[];
+extern const char kPurgeMemoryButton[];
+
+extern const char kEnableFileCookies[];
+
+extern const char kStartMaximized[];
+
+extern const char kEnableWatchdog[];
+
+extern const char kFirstRun[];
+
+extern const char kNoFirstRun[];
 
 #if defined(OS_POSIX)
-extern const wchar_t kNoProcessSingletonDialog[];
+extern const char kNoProcessSingletonDialog[];
 #endif
 
-extern const wchar_t kMessageLoopHistogrammer[];
+extern const char kMessageLoopHistogrammer[];
 
-extern const wchar_t kImport[];
+extern const char kImport[];
 
-extern const wchar_t kSilentDumpOnDCHECK[];
+extern const char kSilentDumpOnDCHECK[];
 
-extern const wchar_t kDisablePromptOnRepost[];
+extern const char kDisablePromptOnRepost[];
 
-extern const wchar_t kDisablePopupBlocking[];
-extern const wchar_t kDisableJavaScript[];
-extern const wchar_t kDisableJava[];
-extern const wchar_t kDisablePlugins[];
-extern const wchar_t kDisableImages[];
-extern const wchar_t kDisableWebSecurity[];
-extern const wchar_t kEnableRemoteFonts[];
+extern const char kDisablePopupBlocking[];
+extern const char kDisableJavaScript[];
+extern const char kDisableJava[];
+extern const char kDisablePlugins[];
+extern const char kDisableImages[];
+extern const char kDisableWebSecurity[];
+extern const char kEnableRemoteFonts[];
 
-extern const wchar_t kUseLowFragHeapCrt[];
+extern const char kUseLowFragHeapCrt[];
 
-extern const wchar_t kInternalNaCl[];
+extern const char kInternalNaCl[];
 
 #ifndef NDEBUG
-extern const wchar_t kGearsPluginPathOverride[];
+extern const char kGearsPluginPathOverride[];
 #endif
 
-extern const wchar_t kEnableFastback[];
+extern const char kEnableFastback[];
 
-extern const wchar_t kDisableSync[];
-extern const wchar_t kSyncerThreadTimedStop[];
+extern const char kDisableSync[];
+extern const char kSyncerThreadTimedStop[];
 
-extern const wchar_t kSdchFilter[];
+extern const char kSdchFilter[];
 
-extern const wchar_t kEnableUserScripts[];
-extern const wchar_t kDisableExtensions[];
-extern const wchar_t kExtensionsUpdateFrequency[];
-extern const wchar_t kLoadExtension[];
-extern const wchar_t kPackExtension[];
-extern const wchar_t kPackExtensionKey[];
-extern const wchar_t kShowExtensionsOnTop[];
-extern const wchar_t kLoadPlugin[];
-extern const wchar_t kUserScriptsDir[];
+extern const char kEnableUserScripts[];
+extern const char kDisableExtensions[];
+extern const char kExtensionsUpdateFrequency[];
+extern const char kLoadExtension[];
+extern const char kPackExtension[];
+extern const char kPackExtensionKey[];
+extern const char kShowExtensionsOnTop[];
+extern const char kLoadPlugin[];
+extern const char kUserScriptsDir[];
 
-extern const wchar_t kIncognito[];
+extern const char kIncognito[];
 
-extern const wchar_t kEnableRendererAccessibility[];
+extern const char kEnableRendererAccessibility[];
 
-extern const wchar_t kTestName[];
+extern const char kTestName[];
 
-extern const wchar_t kRendererCmdPrefix[];
+extern const char kRendererCmdPrefix[];
 
-extern const wchar_t kUtilityCmdPrefix[];
+extern const char kUtilityCmdPrefix[];
 
-extern const wchar_t kWininetFtp[];
+extern const char kWininetFtp[];
 
-extern const wchar_t kEnableNativeWebWorkers[];
-extern const wchar_t kWebWorkerProcessPerCore[];
-extern const wchar_t kWebWorkerShareProcesses[];
+extern const char kEnableNativeWebWorkers[];
+extern const char kWebWorkerProcessPerCore[];
+extern const char kWebWorkerShareProcesses[];
 
-extern const wchar_t kBookmarkMenu[];
+extern const char kBookmarkMenu[];
 
-extern const wchar_t kEnableStatsTable[];
+extern const char kEnableStatsTable[];
 
-extern const wchar_t kExperimentalSpellcheckerFeatures[];
+extern const char kExperimentalSpellcheckerFeatures[];
 
-extern const wchar_t kDisableAudio[];
-extern const wchar_t kSimpleDataSource[];
+extern const char kDisableAudio[];
+extern const char kSimpleDataSource[];
 
-extern const wchar_t kForceFieldTestNameAndValue[];
+extern const char kForceFieldTestNameAndValue[];
 
-extern const wchar_t kNewTabPage[];
-extern const wchar_t kDisableNewTabFirstRun[];
+extern const char kNewTabPage[];
+extern const char kDisableNewTabFirstRun[];
 
-extern const wchar_t kDisableWebResources[];
+extern const char kDisableWebResources[];
 
-extern const wchar_t kEnableBenchmarking[];
+extern const char kEnableBenchmarking[];
 
-extern const wchar_t kNoDefaultBrowserCheck[];
+extern const char kNoDefaultBrowserCheck[];
 
-extern const wchar_t kPrivacyBlacklist[];
+extern const char kPrivacyBlacklist[];
 
-extern const wchar_t kZygoteCmdPrefix[];
+extern const char kZygoteCmdPrefix[];
 
-extern const wchar_t kThumbnailStore[];
+extern const char kThumbnailStore[];
 
-extern const wchar_t kTryChromeAgain[];
+extern const char kTryChromeAgain[];
 
-extern const wchar_t kFileDescriptorLimit[];
+extern const char kFileDescriptorLimit[];
 
-extern const wchar_t kEnableMonitorProfile[];
+extern const char kEnableMonitorProfile[];
 
-extern const wchar_t kDisableXSSAuditor[];
+extern const char kDisableXSSAuditor[];
 
 #if defined(OS_POSIX)
-extern const wchar_t kEnableCrashReporter[];
+extern const char kEnableCrashReporter[];
 #endif
 
-extern const wchar_t kEnableTabtastic2[];
+extern const char kEnableTabtastic2[];
 
-extern const wchar_t kPinnedTabCount[];
+extern const char kPinnedTabCount[];
 
-extern const wchar_t kSearchInOmniboxHint[];
+extern const char kSearchInOmniboxHint[];
 
-extern const wchar_t kEnableLocalStorage[];
+extern const char kEnableLocalStorage[];
 
-extern const wchar_t kEnableSessionStorage[];
+extern const char kEnableSessionStorage[];
 
-extern const wchar_t kAllowSandboxDebugging[];
+extern const char kAllowSandboxDebugging[];
 
 #if defined(OS_MACOSX)
-extern const wchar_t kEnableSandboxLogging[];
+extern const char kEnableSandboxLogging[];
 #endif
 
-extern const wchar_t kEnableSeccompSandbox[];
+extern const char kEnableSeccompSandbox[];
 
-extern const wchar_t kDiagnostics[];
+extern const char kDiagnostics[];
 
-extern const wchar_t kDisableCustomJumpList[];
+extern const char kDisableCustomJumpList[];
 
-extern const wchar_t kEnableDatabases[];
+extern const char kEnableDatabases[];
 
-extern const wchar_t kEnableApplicationCache[];
+extern const char kEnableApplicationCache[];
 
-extern const wchar_t kSyncServiceURL[];
+extern const char kSyncServiceURL[];
 
 #if defined(OS_CHROMEOS)
-extern const wchar_t kCookiePipe[];
-extern const wchar_t kEnableGView[];
+extern const char kCookiePipe[];
+extern const char kEnableGView[];
 #endif
 
-extern const wchar_t kEnableByteRangeSupport[];
+extern const char kEnableByteRangeSupport[];
 
-extern const wchar_t kExplicitlyAllowedPorts[];
+extern const char kExplicitlyAllowedPorts[];
 
-extern const wchar_t kActivateOnLaunch[];
-extern const wchar_t kEnableWebSockets[];
+extern const char kActivateOnLaunch[];
+extern const char kEnableWebSockets[];
 
-extern const wchar_t kEnableExperimentalWebGL[];
+extern const char kEnableExperimentalWebGL[];
 
-extern const wchar_t kEnableDesktopNotifications[];
+extern const char kEnableDesktopNotifications[];
 
 }  // namespace switches
 
diff --git a/chrome/common/debug_flags.cc b/chrome/common/debug_flags.cc
index 5e0b43e..4924f19 100644
--- a/chrome/common/debug_flags.cc
+++ b/chrome/common/debug_flags.cc
@@ -6,6 +6,7 @@
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "ipc/ipc_switches.h"
 
@@ -16,8 +17,8 @@ bool DebugFlags::ProcessDebugFlags(CommandLine* command_line,
   const CommandLine& current_cmd_line = *CommandLine::ForCurrentProcess();
   if (current_cmd_line.HasSwitch(switches::kDebugChildren)) {
     // Look to pass-on the kDebugOnStart flag.
-    std::wstring value;
-    value = current_cmd_line.GetSwitchValue(switches::kDebugChildren);
+    std::string value = current_cmd_line.GetSwitchValueASCII(
+        switches::kDebugChildren);
     if (value.empty() ||
         (type == ChildProcessInfo::RENDER_PROCESS &&
          value == switches::kRendererProcess) ||
@@ -29,8 +30,8 @@ bool DebugFlags::ProcessDebugFlags(CommandLine* command_line,
     command_line->AppendSwitchWithValue(switches::kDebugChildren, value);
   } else if (current_cmd_line.HasSwitch(switches::kWaitForDebuggerChildren)) {
     // Look to pass-on the kWaitForDebugger flag.
-    std::wstring value;
-    value = current_cmd_line.GetSwitchValue(switches::kWaitForDebuggerChildren);
+    std::string value = current_cmd_line.GetSwitchValueASCII(
+        switches::kWaitForDebuggerChildren);
     if (value.empty() ||
         (type == ChildProcessInfo::RENDER_PROCESS &&
          value == switches::kRendererProcess) ||
diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc
index ae0b48e..3236468 100644
--- a/chrome/common/logging_chrome.cc
+++ b/chrome/common/logging_chrome.cc
@@ -100,12 +100,12 @@ void InitChromeLogging(const CommandLine& command_line,
   // only use OutputDebugString in debug mode
 #ifdef NDEBUG
   bool enable_logging = false;
-  const wchar_t *kInvertLoggingSwitch = switches::kEnableLogging;
+  const char *kInvertLoggingSwitch = switches::kEnableLogging;
   const logging::LoggingDestination kDefaultLoggingMode =
       logging::LOG_ONLY_TO_FILE;
 #else
   bool enable_logging = true;
-  const wchar_t *kInvertLoggingSwitch = switches::kDisableLogging;
+  const char *kInvertLoggingSwitch = switches::kDisableLogging;
   const logging::LoggingDestination kDefaultLoggingMode =
       logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG;
 #endif
diff --git a/chrome/common/sandbox_init_wrapper.cc b/chrome/common/sandbox_init_wrapper.cc
index 14006ed..31488f7 100644
--- a/chrome/common/sandbox_init_wrapper.cc
+++ b/chrome/common/sandbox_init_wrapper.cc
@@ -19,7 +19,7 @@ void SandboxInitWrapper::SetServices(sandbox::SandboxInterfaceInfo* info) {
 #endif
 
 void SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line,
-                                           const std::wstring& process_type) {
+                                           const std::string& process_type) {
 #if defined(OS_WIN)
   if (!target_services_)
     return;
diff --git a/chrome/common/sandbox_init_wrapper.h b/chrome/common/sandbox_init_wrapper.h
index c8893a3..a1c2de9 100644
--- a/chrome/common/sandbox_init_wrapper.h
+++ b/chrome/common/sandbox_init_wrapper.h
@@ -34,7 +34,7 @@ class SandboxInitWrapper {
   // Initialize the sandbox for renderer and plug-in processes, depending on
   // the command line flags. The browser process is not sandboxed.
   void InitializeSandbox(const CommandLine& parsed_command_line,
-                         const std::wstring& process_type);
+                         const std::string& process_type);
  private:
   sandbox::BrokerServices* broker_services_;
   sandbox::TargetServices* target_services_;
@@ -51,14 +51,14 @@ class SandboxInitWrapper {
   // Initialize the sandbox for renderer and plug-in processes, depending on
   // the command line flags. The browser process is not sandboxed.
   void InitializeSandbox(const CommandLine& parsed_command_line,
-                         const std::wstring& process_type);
+                         const std::string& process_type);
 
 #if defined(OS_MACOSX)
   // We keep the process type so we can configure the sandbox as needed.
  public:
-  std::wstring ProcessType() const { return process_type_; }
+  std::string ProcessType() const { return process_type_; }
  private:
-  std::wstring process_type_;
+  std::string process_type_;
 #endif
 
  private: