From d420c31e107cd932582a4a8add0ce2676e4b52da Mon Sep 17 00:00:00 2001
From: "evan@chromium.org"
 <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 30 Jul 2010 02:14:22 +0000
Subject: Add an AppendSwitchASCII to CommandLine, and convert a test to it.

I'm removing all the AppendSwitchWithValue() users due to wstrings,
and this is one caller.  Since fixing this one caller requires
touching many files, I thought I'd isolate this change from
the other WithValue->ASCII conversions.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54257 0039d316-1c4b-4281-b951-d872f2087c98
---
 ipc/ipc_tests.cc | 27 +++++++++++----------------
 ipc/ipc_tests.h  |  5 ++---
 2 files changed, 13 insertions(+), 19 deletions(-)

(limited to 'ipc')

diff --git a/ipc/ipc_tests.cc b/ipc/ipc_tests.cc
index c11fb70..c82eef9 100644
--- a/ipc/ipc_tests.cc
+++ b/ipc/ipc_tests.cc
@@ -67,20 +67,15 @@ base::ProcessHandle IPCChannelTest::SpawnChild(ChildType child_type,
 
   switch (child_type) {
   case TEST_CLIENT:
-    return MultiProcessTest::SpawnChild(L"RunTestClient", debug_on_start);
-    break;
+    return MultiProcessTest::SpawnChild("RunTestClient", debug_on_start);
   case TEST_REFLECTOR:
-    return MultiProcessTest::SpawnChild(L"RunReflector", debug_on_start);
-    break;
+    return MultiProcessTest::SpawnChild("RunReflector", debug_on_start);
   case FUZZER_SERVER:
-    return MultiProcessTest::SpawnChild(L"RunFuzzServer", debug_on_start);
-    break;
+    return MultiProcessTest::SpawnChild("RunFuzzServer", debug_on_start);
   case SYNC_SOCKET_SERVER:
-    return MultiProcessTest::SpawnChild(L"RunSyncSocketServer", debug_on_start);
-    break;
+    return MultiProcessTest::SpawnChild("RunSyncSocketServer", debug_on_start);
   default:
     return NULL;
-    break;
   }
 }
 #elif defined(OS_POSIX)
@@ -99,32 +94,32 @@ base::ProcessHandle IPCChannelTest::SpawnChild(ChildType child_type,
   base::ProcessHandle ret = NULL;
   switch (child_type) {
   case TEST_CLIENT:
-    ret = MultiProcessTest::SpawnChild(L"RunTestClient",
+    ret = MultiProcessTest::SpawnChild("RunTestClient",
                                        fds_to_map,
                                        debug_on_start);
     break;
   case TEST_DESCRIPTOR_CLIENT:
-    ret = MultiProcessTest::SpawnChild(L"RunTestDescriptorClient",
+    ret = MultiProcessTest::SpawnChild("RunTestDescriptorClient",
                                        fds_to_map,
                                        debug_on_start);
     break;
   case TEST_DESCRIPTOR_CLIENT_SANDBOXED:
-    ret = MultiProcessTest::SpawnChild(L"RunTestDescriptorClientSandboxed",
+    ret = MultiProcessTest::SpawnChild("RunTestDescriptorClientSandboxed",
                                        fds_to_map,
                                        debug_on_start);
     break;
   case TEST_REFLECTOR:
-    ret = MultiProcessTest::SpawnChild(L"RunReflector",
+    ret = MultiProcessTest::SpawnChild("RunReflector",
                                        fds_to_map,
                                        debug_on_start);
     break;
   case FUZZER_SERVER:
-    ret = MultiProcessTest::SpawnChild(L"RunFuzzServer",
+    ret = MultiProcessTest::SpawnChild("RunFuzzServer",
                                        fds_to_map,
                                        debug_on_start);
     break;
   case SYNC_SOCKET_SERVER:
-    ret = MultiProcessTest::SpawnChild(L"RunSyncSocketServer",
+    ret = MultiProcessTest::SpawnChild("RunSyncSocketServer",
                                        fds_to_map,
                                        debug_on_start);
     break;
@@ -272,7 +267,7 @@ TEST_F(IPCChannelTest, ChannelProxyTest) {
     }
 
     base::ProcessHandle process_handle = MultiProcessTest::SpawnChild(
-        L"RunTestClient",
+        "RunTestClient",
         fds_to_map,
         debug_on_start);
 #endif  // defined(OS_POSIX)
diff --git a/ipc/ipc_tests.h b/ipc/ipc_tests.h
index 89117ab..09a5ab8 100644
--- a/ipc/ipc_tests.h
+++ b/ipc/ipc_tests.h
@@ -40,11 +40,10 @@ class IPCChannelTest : public MultiProcessTest {
   virtual void TearDown();
 
   // Spawns a child process of the specified type
-  base::ProcessHandle SpawnChild(ChildType child_type,
-                                 IPC::Channel *channel);
+  base::ProcessHandle SpawnChild(ChildType child_type, IPC::Channel* channel);
 
   // Created around each test instantiation.
-  MessageLoopForIO *message_loop_;
+  MessageLoopForIO* message_loop_;
 };
 
 #endif  // IPC_IPC_TESTS_H__
-- 
cgit v1.1