Remove GetSwitchValue() from chrome/* where easy.

chrome/test/url_fetch_test/url_fetch_test.cc

 // Copyright (c) 2010 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/path_service.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 31 matching lines @@
       browser_directory_ = dir;
     }
     UITest::SetUp();
 
     // We've shortened the default timeouts, but dom_perf on Vista needs longer
     // timeouts. Setting timeouts to the previous values before r52666.
     set_action_timeout_ms(std::max(60000, action_timeout_ms()));
   }
 
   void RunTest(const GURL& url, const char* wait_cookie_name,
-               const char* wait_cookie_value, const wchar_t* var_to_fetch,
+               const char* wait_cookie_value, const char* var_to_fetch,
                UrlFetchTestResult* result) {
     scoped_refptr<TabProxy> tab(GetActiveTab());
     ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(url));
 
     if (wait_cookie_name) {
       if (wait_cookie_value) {
         bool completed = WaitUntilCookieValue(tab.get(), url, wait_cookie_name,
                                               UITest::test_timeout_ms(),
                                               wait_cookie_value);
         ASSERT_TRUE(completed);
       } else {
         result->cookie_value = WaitUntilCookieNonEmpty(
             tab.get(), url, wait_cookie_name, UITest::test_timeout_ms());
         ASSERT_TRUE(result->cookie_value.length());
       }
     }
     if (var_to_fetch) {
-      std::wstring script = StringPrintf(
-          L"window.domAutomationController.send(%ls);", var_to_fetch);
+      std::string script = StringPrintf(
+          "window.domAutomationController.send(%s);", var_to_fetch);
 
       std::wstring value;
-      bool success = tab->ExecuteAndExtractString(L"", script, &value);
+      bool success = tab->ExecuteAndExtractString(L"", ASCIIToWide(script),
+                                                  &value);
       ASSERT_TRUE(success);
       result->javascript_variable = WideToUTF8(value);
     }
   }
 };
 
 bool WriteValueToFile(std::string value, const FilePath& path) {
   int retval = file_util::WriteFile(path, value.c_str(), value.length());
   return retval == static_cast<int>(value.length());
 }
@@ skipping 29 matching lines @@
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
 
   if (!cmd_line->HasSwitch("url"))
     return;
 
   std::string cookie_name =
       cmd_line->GetSwitchValueASCII("wait_cookie_name");
   std::string cookie_value =
       cmd_line->GetSwitchValueASCII("wait_cookie_value");
 
-  std::wstring jsvar = cmd_line->GetSwitchValue("jsvar");
+  std::string jsvar = cmd_line->GetSwitchValueASCII("jsvar");
 
   UrlFetchTestResult result;
-  RunTest(GURL(WideToASCII(cmd_line->GetSwitchValue("url"))),
+  RunTest(GURL(cmd_line->GetSwitchValueASCII("url")),
           cookie_name.length() > 0 ? cookie_name.c_str() : NULL,
           cookie_value.length() > 0 ? cookie_value.c_str() : NULL,
           jsvar.length() > 0 ? jsvar.c_str() : NULL,
           &result);
 
   // Write out the cookie if requested
   FilePath cookie_output_path =
       cmd_line->GetSwitchValuePath("wait_cookie_output");
   if (cookie_output_path.value().size() > 0) {
     ASSERT_TRUE(WriteValueToFile(result.cookie_value, cookie_output_path));
   }
 
   // Write out the JS Variable if requested
   FilePath jsvar_output_path = cmd_line->GetSwitchValuePath("jsvar_output");
   if (jsvar_output_path.value().size() > 0) {
     ASSERT_TRUE(WriteValueToFile(result.javascript_variable,
                                  jsvar_output_path));
   }
 }
 
 }  // namespace