Use GetSwitchValueASCII, so we don't use the deprecated versions.

Patch from Thiago Farina <thiago.farina@gmail.com>.

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

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

4 files changed, 11 insertions, 13 deletions

diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 8dee0dc..b42509d 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -753,8 +753,8 @@ bool BrowserInit::ProcessCmdLineImpl(const CommandLine& command_line,
 
     if (command_line.HasSwitch(switches::kPackExtension)) {
       // Input Paths.
-      FilePath src_dir = FilePath::FromWStringHack(command_line.GetSwitchValue(
-          switches::kPackExtension));
+      FilePath src_dir = command_line.GetSwitchValuePath(
+          switches::kPackExtension);
       FilePath private_key_path;
       if (command_line.HasSwitch(switches::kPackExtensionKey)) {
         private_key_path = command_line.GetSwitchValuePath(
@@ -826,7 +826,7 @@ bool BrowserInit::ProcessCmdLineImpl(const CommandLine& command_line,
 
   if (command_line.HasSwitch(switches::kUseFlip)) {
     std::string flip_mode =
-        WideToASCII(command_line.GetSwitchValue(switches::kUseFlip));
+        command_line.GetSwitchValueASCII(switches::kUseFlip);
     net::HttpNetworkLayer::EnableFlip(flip_mode);
   }
 
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index eb38226..6ca2b4b 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -514,8 +514,8 @@ int BrowserMain(const MainFunctionParams& parameters) {
 
 #if defined(OS_WIN)
   // This is experimental code. See first_run_win.cc for more info.
-  std::wstring try_chrome =
-      parsed_command_line.GetSwitchValue(switches::kTryChromeAgain);
+  std::string try_chrome =
+      parsed_command_line.GetSwitchValueASCII(switches::kTryChromeAgain);
   if (!try_chrome.empty()) {
     Upgrade::TryResult answer =
         Upgrade::ShowTryChromeDialog(StringToInt(try_chrome));
@@ -827,7 +827,7 @@ int BrowserMain(const MainFunctionParams& parameters) {
   std::string sdch_supported_domain("");
   if (parsed_command_line.HasSwitch(switches::kSdchFilter)) {
     sdch_supported_domain =
-        WideToASCII(parsed_command_line.GetSwitchValue(switches::kSdchFilter));
+        parsed_command_line.GetSwitchValueASCII(switches::kSdchFilter);
   } else {
     sdch_trial->AppendGroup("_global_disable_sdch",
                             kSDCH_PROBABILITY_PER_GROUP);
diff --git a/chrome/browser/jankometer.cc b/chrome/browser/jankometer.cc
index 10d2f14..6d396ef 100644
--- a/chrome/browser/jankometer.cc
+++ b/chrome/browser/jankometer.cc
@@ -232,11 +232,11 @@ void InstallJankometer(const CommandLine& parsed_command_line) {
   bool ui_watchdog_enabled = false;
   bool io_watchdog_enabled = false;
   if (parsed_command_line.HasSwitch(switches::kEnableWatchdog)) {
-    std::wstring list =
-        parsed_command_line.GetSwitchValue(switches::kEnableWatchdog);
-    if (list.npos != list.find(L"ui"))
+    std::string list =
+        parsed_command_line.GetSwitchValueASCII(switches::kEnableWatchdog);
+    if (list.npos != list.find("ui"))
       ui_watchdog_enabled = true;
-    if (list.npos != list.find(L"io"))
+    if (list.npos != list.find("io"))
       io_watchdog_enabled = true;
   }
 
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 3f5deee..111029b 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -680,9 +680,7 @@ void ProfileImpl::InitExtensions() {
 
   // Load any extensions specified with --load-extension.
   if (command_line->HasSwitch(switches::kLoadExtension)) {
-    std::wstring path_string =
-        command_line->GetSwitchValue(switches::kLoadExtension);
-    FilePath path = FilePath::FromWStringHack(path_string);
+    FilePath path = command_line->GetSwitchValuePath(switches::kLoadExtension);
     extensions_service_->LoadExtension(path);
 
     // Tell UserScriptMaser to watch this extension's directory for changes so