CommandLine API rework

chrome/test/automation/automation_proxy_uitest.cc

 // Copyright (c) 2006-2008 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 <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/test/automation/constrained_window_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "chrome/views/dialog_delegate.h"
 #include "chrome/views/event.h"
 #include "net/base/net_util.h"
 
 class AutomationProxyTest : public UITest {
  protected:
   AutomationProxyTest() {
     dom_automation_enabled_ = true;
-    CommandLine::AppendSwitchWithValue(&launch_arguments_,
-                                       switches::kLang,
-                                       L"en-us");
+    launch_arguments_.AppendSwitchWithValue(switches::kLang,
+                                            L"en-us");
   }
 };
 
 class AutomationProxyVisibleTest : public UITest {
  protected:
   AutomationProxyVisibleTest() {
     show_window_ = true;
   }
 };
 
@@ skipping 323 matching lines @@
 }
 
 class AutomationProxyTest2 : public AutomationProxyVisibleTest {
  protected:
   AutomationProxyTest2() {
     document1_ = test_data_directory_;
     file_util::AppendToPath(&document1_, L"title1.html");
 
     document2_ = test_data_directory_;
     file_util::AppendToPath(&document2_, L"title2.html");
-    launch_arguments_ = document1_ + L" " + document2_;
+    launch_arguments_ = CommandLine(L"");
+    launch_arguments_.AppendLooseValue(document1_);
+    launch_arguments_.AppendLooseValue(document2_);
   }
 
   std::wstring document1_;
   std::wstring document2_;
 };
 
 TEST_F(AutomationProxyTest2, GetActiveTabIndex) {
   scoped_ptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
@@ skipping 184 matching lines @@
 // type value
 
 class AutomationProxyTest3 : public UITest {
  protected:
   AutomationProxyTest3() : UITest() {
     document1_ = test_data_directory_;
     file_util::AppendToPath(&document1_, L"frame_dom_access");
     file_util::AppendToPath(&document1_, L"frame_dom_access.html");
 
     dom_automation_enabled_ = true;
-    launch_arguments_ = document1_;
+    launch_arguments_ = CommandLine(L"");
+    launch_arguments_.AppendLooseValue(document1_);
   }
 
   std::wstring document1_;
 };
 
 std::wstring CreateJSStringForDOMQuery(const std::wstring& id) {
   std::wstring jscript(L"window.domAutomationController");
   StringAppendF(&jscript, L".send(document.getElementById('%ls').nodeName);",
                 id.c_str());
   return jscript;
@@ skipping 311 matching lines @@
   // Click Cancel this time.
   EXPECT_TRUE(automation()->ClickAppModalDialogButton(
       views::DialogDelegate::DIALOGBUTTON_CANCEL));
   EXPECT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
                                                      &button));
   EXPECT_FALSE(modal_dialog_showing);
   EXPECT_TRUE(tab->ExecuteAndExtractInt(
       L"", L"window.domAutomationController.send(result);", &result));
   EXPECT_EQ(1, result);
 }