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, 24 insertions, 24 deletions

diff --git a/chrome/test/ui/dom_checker_uitest.cc b/chrome/test/ui/dom_checker_uitest.cc
index 37a50f7..e9a4996 100644
--- a/chrome/test/ui/dom_checker_uitest.cc
+++ b/chrome/test/ui/dom_checker_uitest.cc
@@ -27,7 +27,7 @@ static const FilePath::CharType kTestDirectory[] =
 static const FilePath::CharType kStartFile[] =
     FILE_PATH_LITERAL("dom_checker.html");
 
-const wchar_t kRunDomCheckerTest[] = L"run-dom-checker-test";
+const char kRunDomCheckerTest[] = "run-dom-checker-test";
 
 class DomCheckerTest : public UITest {
  public:
diff --git a/chrome/test/ui/omnibox_uitest.cc b/chrome/test/ui/omnibox_uitest.cc
index af94102..ebf5d7b 100644
--- a/chrome/test/ui/omnibox_uitest.cc
+++ b/chrome/test/ui/omnibox_uitest.cc
@@ -19,7 +19,7 @@
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 
-const wchar_t kRunOmniboxTest[] = L"run_omnibox_test";
+const char kRunOmniboxTest[] = "run_omnibox_test";
 
 class OmniboxTest : public UITest {
  public:
diff --git a/chrome/test/ui/sunspider_uitest.cc b/chrome/test/ui/sunspider_uitest.cc
index 3f6c8f5..a3c20db 100644
--- a/chrome/test/ui/sunspider_uitest.cc
+++ b/chrome/test/ui/sunspider_uitest.cc
@@ -21,7 +21,7 @@ namespace {
 static const FilePath::CharType kStartFile[] =
     FILE_PATH_LITERAL("sunspider-driver.html");
 
-const wchar_t kRunSunSpider[] = L"run-sunspider";
+const char kRunSunSpider[] = "run-sunspider";
 
 class SunSpiderTest : public UITest {
  public:
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index cf49227..c4a37e2 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -77,17 +77,17 @@ std::wstring UITest::log_level_ = L"";
 // Specify the time (in milliseconds) that the ui_tests should wait before
 // timing out. This is used to specify longer timeouts when running under Purify
 // which requires much more time.
-const wchar_t kUiTestTimeout[] = L"ui-test-timeout";
-const wchar_t kUiTestActionTimeout[] = L"ui-test-action-timeout";
-const wchar_t kUiTestActionMaxTimeout[] = L"ui-test-action-max-timeout";
-const wchar_t kUiTestSleepTimeout[] = L"ui-test-sleep-timeout";
-const wchar_t kUiTestTerminateTimeout[] = L"ui-test-terminate-timeout";
+const char kUiTestTimeout[] = "ui-test-timeout";
+const char kUiTestActionTimeout[] = "ui-test-action-timeout";
+const char kUiTestActionMaxTimeout[] = "ui-test-action-max-timeout";
+const char kUiTestSleepTimeout[] = "ui-test-sleep-timeout";
+const char kUiTestTerminateTimeout[] = "ui-test-terminate-timeout";
 
-const wchar_t kExtraChromeFlagsSwitch[] = L"extra-chrome-flags";
+const char kExtraChromeFlagsSwitch[] = "extra-chrome-flags";
 
 // By default error dialogs are hidden, which makes debugging failures in the
 // slave process frustrating. By passing this in error dialogs are enabled.
-const wchar_t kEnableErrorDialogs[] = L"enable-errdialogs";
+const char kEnableErrorDialogs[] = "enable-errdialogs";
 
 // Uncomment this line to have the spawned process wait for the debugger to
 // attach.  This only works on Windows.  On posix systems, you can set the
@@ -308,16 +308,16 @@ static void RunCommand(const CommandLine& cmd_line) {
 void UITest::StartHttpServer(const FilePath& root_directory) {
   scoped_ptr<CommandLine> cmd_line(CreateHttpServerCommandLine());
   ASSERT_TRUE(cmd_line.get());
-  cmd_line->AppendSwitchWithValue(L"server", L"start");
-  cmd_line->AppendSwitch(L"register_cygwin");
-  cmd_line->AppendSwitchWithValue(L"root", root_directory.ToWStringHack());
+  cmd_line->AppendSwitchWithValue("server", "start");
+  cmd_line->AppendSwitch("register_cygwin");
+  cmd_line->AppendSwitchWithValue("root", root_directory.ToWStringHack());
 
   // For Windows 7, if we start the lighttpd server on the foreground mode,
   // it will mess up with the command window and cause conhost.exe to crash. To
   // work around this, we start the http server on the background mode.
 #if defined(OS_WIN)
   if (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7)
-    cmd_line->AppendSwitch(L"run_background");
+    cmd_line->AppendSwitch("run_background");
 #endif
 
   RunCommand(*cmd_line.get());
@@ -326,7 +326,7 @@ void UITest::StartHttpServer(const FilePath& root_directory) {
 void UITest::StopHttpServer() {
   scoped_ptr<CommandLine> cmd_line(CreateHttpServerCommandLine());
   ASSERT_TRUE(cmd_line.get());
-  cmd_line->AppendSwitchWithValue(L"server", L"stop");
+  cmd_line->AppendSwitchWithValue("server", "stop");
   RunCommand(*cmd_line.get());
 }
 
diff --git a/chrome/test/ui/ui_test_suite.cc b/chrome/test/ui/ui_test_suite.cc
index 691a75f..a26000f 100644
--- a/chrome/test/ui/ui_test_suite.cc
+++ b/chrome/test/ui/ui_test_suite.cc
@@ -10,14 +10,14 @@
 #include "chrome/common/env_vars.h"
 
 // Force a test to use an already running browser instance. UI tests only.
-const wchar_t UITestSuite::kUseExistingBrowser[] = L"use-existing-browser";
+const char UITestSuite::kUseExistingBrowser[] = "use-existing-browser";
 
 // Timeout for the test in milliseconds.  UI tests only.
-const wchar_t UITestSuite::kTestTimeout[] = L"test-timeout";
+const char UITestSuite::kTestTimeout[] = "test-timeout";
 
 // Parameters to run test in parallel.  UI tests only.
-const wchar_t UITestSuite::kBatchCount[] = L"batch-count";
-const wchar_t UITestSuite::kBatchIndex[] = L"batch-index";
+const char UITestSuite::kBatchCount[] = "batch-count";
+const char UITestSuite::kBatchIndex[] = "batch-index";
 const char UITestSuite::kGTestTotalShards[] = "GTEST_TOTAL_SHARDS=";
 const char UITestSuite::kGTestShardIndex[] = "GTEST_SHARD_INDEX=";
 
diff --git a/chrome/test/ui/ui_test_suite.h b/chrome/test/ui/ui_test_suite.h
index b5771cb..6354d5f 100644
--- a/chrome/test/ui/ui_test_suite.h
+++ b/chrome/test/ui/ui_test_suite.h
@@ -27,10 +27,10 @@ class UITestSuite : public ChromeTestSuite {
   base::ProcessHandle crash_service_;
 #endif
 
-  static const wchar_t kUseExistingBrowser[];
-  static const wchar_t kTestTimeout[];
-  static const wchar_t kBatchCount[];
-  static const wchar_t kBatchIndex[];
+  static const char kUseExistingBrowser[];
+  static const char kTestTimeout[];
+  static const char kBatchCount[];
+  static const char kBatchIndex[];
   static const char kGTestTotalShards[];
   static const char kGTestShardIndex[];
 };
diff --git a/chrome/test/ui/v8_benchmark_uitest.cc b/chrome/test/ui/v8_benchmark_uitest.cc
index 103e47a..4a248f7 100644
--- a/chrome/test/ui/v8_benchmark_uitest.cc
+++ b/chrome/test/ui/v8_benchmark_uitest.cc
@@ -22,7 +22,7 @@ namespace {
 static const FilePath::CharType kStartFile[] =
     FILE_PATH_LITERAL("run.html");
 
-const wchar_t kRunV8Benchmark[] = L"run-v8-benchmark";
+const char kRunV8Benchmark[] = "run-v8-benchmark";
 
 class V8BenchmarkTest : public UITest {
  public: