Use ASCII strings for switch names.

chrome/test/url_fetch_test/url_fetch_test.cc

 // Copyright (c) 2009 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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 
 namespace {
 
 // Provides a UI Test that lets us take the browser to a url, and
 // wait for a cookie value to be set before closing the page.
 class UrlFetchTest : public UITest {
  public:
   UrlFetchTest() {
     show_window_ = true;
     dom_automation_enabled_ = true;
   }
   struct UrlFetchTestResult {
     std::string cookie_value;
     std::string javascript_variable;
   };
 
   void SetUp() {
     const CommandLine *cmdLine = CommandLine::ForCurrentProcess();
-    if (cmdLine->HasSwitch(L"reference_build")) {
+    if (cmdLine->HasSwitch("reference_build")) {
       FilePath dir;
       PathService::Get(chrome::DIR_TEST_TOOLS, &dir);
       dir = dir.AppendASCII("reference_build");
 #if defined(OS_WIN)
       dir = dir.AppendASCII("chrome");
 #elif defined(OS_LINUX)
       dir = dir.AppendASCII("chrome_linux");
 #elif defined(OS_MACOSX)
       dir = dir.AppendASCII("chrome_mac");
 #endif
@@ skipping 61 matching lines @@
 //
 // --jsvar_output=<filepath>
 //   Write the value of the variable named by '--jsvar' to a file at the given
 //   path.
 //
 // --reference_build
 //   Use the reference build of chrome for the test.
 TEST_F(UrlFetchTest, UrlFetch) {
   const CommandLine *cmdLine = CommandLine::ForCurrentProcess();
 
-  if (!cmdLine->HasSwitch(L"url")) {
+  if (!cmdLine->HasSwitch("url")) {
     return;
   }
 
   std::string cookieName =
-    WideToASCII(cmdLine->GetSwitchValue(L"wait_cookie_name"));
+      cmdLine->GetSwitchValueASCII("wait_cookie_name");
   std::string cookieValue =
-    WideToASCII(cmdLine->GetSwitchValue(L"wait_cookie_value"));
+      cmdLine->GetSwitchValueASCII("wait_cookie_value");
 
-  std::wstring jsvar = cmdLine->GetSwitchValue(L"jsvar");
+  std::wstring jsvar = cmdLine->GetSwitchValue("jsvar");
 
   UrlFetchTestResult result;
-  RunTest(GURL(WideToASCII(cmdLine->GetSwitchValue(L"url"))),
+  RunTest(GURL(WideToASCII(cmdLine->GetSwitchValue("url"))),
           cookieName.length() > 0 ? cookieName.c_str() : NULL,
           cookieValue.length() > 0 ? cookieValue.c_str() : NULL,
           jsvar.length() > 0 ? jsvar.c_str() : NULL,
           &result);
 
   // Write out the cookie if requested
   std::wstring cookieOutputPath =
-    cmdLine->GetSwitchValue(L"wait_cookie_output");
+      cmdLine->GetSwitchValue("wait_cookie_output");
   if (cookieOutputPath.length() > 0) {
     ASSERT_TRUE(writeValueToFile(result.cookie_value, cookieOutputPath));
   }
 
   // Write out the JS Variable if requested
-  std::wstring jsvarOutputPath = cmdLine->GetSwitchValue(L"jsvar_output");
+  std::wstring jsvarOutputPath = cmdLine->GetSwitchValue("jsvar_output");
   if (jsvarOutputPath.length() > 0) {
     ASSERT_TRUE(writeValueToFile(result.javascript_variable, jsvarOutputPath));
   }
 }
 
 }  // namespace