De-wstringify perf_test_suite.h and test_suite.h.

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

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

2 files changed, 8 insertions, 14 deletions

diff --git a/base/test/perf_test_suite.h b/base/test/perf_test_suite.h
index 8838462..bac5a63 100644
--- a/base/test/perf_test_suite.h
+++ b/base/test/perf_test_suite.h
@@ -23,16 +23,13 @@ class PerfTestSuite : public TestSuite {
     TestSuite::Initialize();
 
     // Initialize the perf timer log
-    FilePath log_path;
-    std::wstring log_file =
-        CommandLine::ForCurrentProcess()->GetSwitchValue("log-file");
-    if (log_file.empty()) {
+    FilePath log_path =
+        CommandLine::ForCurrentProcess()->GetSwitchValuePath("log-file");
+    if (log_path.empty()) {
       FilePath exe;
       PathService::Get(base::FILE_EXE, &exe);
       log_path = exe.ReplaceExtension(FILE_PATH_LITERAL("log"));
       log_path = log_path.InsertBeforeExtension(FILE_PATH_LITERAL("_perf"));
-    } else {
-      log_path = FilePath::FromWStringHack(log_file);
     }
     ASSERT_TRUE(InitPerfLog(log_path));
 
diff --git a/base/test/test_suite.h b/base/test/test_suite.h
index 3c40fd1..85ab068 100644
--- a/base/test/test_suite.h
+++ b/base/test/test_suite.h
@@ -140,15 +140,12 @@ class TestSuite {
     base::ScopedNSAutoreleasePool scoped_pool;
 
     Initialize();
-    std::wstring client_func =
-        CommandLine::ForCurrentProcess()->GetSwitchValue(kRunClientProcess);
+    std::string client_func =
+        CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+            kRunClientProcess);
     // Check to see if we are being run as a client process.
-    if (!client_func.empty()) {
-      // Convert our function name to a usable string for GetProcAddress.
-      std::string func_name(client_func.begin(), client_func.end());
-
-      return multi_process_function_list::InvokeChildProcessTest(func_name);
-    }
+    if (!client_func.empty())
+      return multi_process_function_list::InvokeChildProcessTest(client_func);
     int result = RUN_ALL_TESTS();
 
     // If there are failed tests, see if we should ignore the failures.