Make CommandLine into a normal object, with some statics for getting at the current process's command line.

One explicit goal of this change is to *not* deal with the string/wstring issues at the API on POSIX; the functions are the same as before, which means they remain as broken as before.  (I did try to fix the internals, though, so migrating the callers is now possible by adding platform-appropriate hooks.)

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


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

1 files changed, 5 insertions, 16 deletions

diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index d458662..0faaf8e 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -76,27 +76,16 @@ class PluginTest : public UITest {
                       KEY_WRITE)) {
         regkey.CreateKey(L"CHROME.EXE", KEY_READ);
       }
-      if (!launch_arguments_.empty())
-        launch_arguments_.append(L" ");
-      launch_arguments_.append(L"--" kNoNativeActiveXShimSwitch);
+      launch_arguments_.AppendSwitch(kNoNativeActiveXShimSwitch);
 
     } else if (strcmp(test_info->name(), "MediaPlayerOld") == 0) {
       // When testing the old WMP plugin, we need to force Chrome to not load
       // the new plugin.
-      if (!launch_arguments_.empty())
-        launch_arguments_.append(L" ");
-
-      launch_arguments_.append(L"--" kUseOldWMPPluginSwitch);
-      launch_arguments_.append(L" ");
-      launch_arguments_.append(L"--" kNoNativeActiveXShimSwitch);
+      launch_arguments_.AppendSwitch(kUseOldWMPPluginSwitch);
+      launch_arguments_.AppendSwitch(kNoNativeActiveXShimSwitch);
     } else if (strcmp(test_info->name(), "FlashSecurity") == 0) {
-      if (!launch_arguments_.empty())
-        launch_arguments_.append(L" ");
-
-      launch_arguments_.append(L"--");
-      launch_arguments_.append(switches::kTestSandbox); 
-      launch_arguments_.append(L"=");
-      launch_arguments_.append(L"security_tests.dll");
+      launch_arguments_.AppendSwitchWithValue(switches::kTestSandbox,
+                                              L"security_tests.dll");
     }
 
     UITest::SetUp();