CommandLine API rework

chrome/browser/sessions/session_restore_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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/scoped_ptr.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 20 matching lines @@
         path_prefix.Append(FILE_PATH_LITERAL("bot2.html")));
     url3 = net::FilePathToFileURL(
         path_prefix.Append(FILE_PATH_LITERAL("bot3.html")));
   }
 
   virtual void QuitBrowserAndRestore() {
     UITest::TearDown();
 
     clear_profile_ = false;
 
-    CommandLine::AppendSwitch(&launch_arguments_,
-                              switches::kRestoreLastSession);
+    launch_arguments_.AppendSwitch(switches::kRestoreLastSession);
     UITest::SetUp();
   }
 
   void CloseWindow(int window_index, int initial_count) {
     scoped_ptr<BrowserProxy> browser_proxy(
         automation()->GetBrowserWindow(window_index));
     ASSERT_TRUE(browser_proxy.get());
     ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_CLOSE_WINDOW));
     browser_proxy.reset();
     int window_count;
@@ skipping 223 matching lines @@
 
   // Close the first window.
   CloseWindow(0, 2);
   browser_proxy.reset();
 
   // Launch the browser again. Note, this doesn't spawn a new process, instead
   // it attaches to the current process.
   include_testing_id_ = false;
   use_existing_browser_ = true;
   clear_profile_ = false;
-  CommandLine::AppendSwitch(&launch_arguments_, switches::kRestoreLastSession);
+  launch_arguments_.AppendSwitch(switches::kRestoreLastSession);
   LaunchBrowser(launch_arguments_, false);
 
   // A new window should appear;
   ASSERT_TRUE(automation()->WaitForWindowCountToChange(1, &window_count,
                                                        action_timeout_ms()) &&
               window_count == 2);
 
   // And it shouldn't have url1 in it.
   browser_proxy.reset(automation()->GetBrowserWindow(1));
   ASSERT_TRUE(browser_proxy.get());
@@ skipping 41 matching lines @@
 // Launches an app window, closes tabbed browser, launches and makes sure
 // we restore the tabbed browser url.
 TEST_F(SessionRestoreUITest,
        DISABLED_RestoreAfterClosingTabbedBrowserWithAppAndLaunching) {
   NavigateToURL(url1);
 
   // Launch an app.
   include_testing_id_ = false;
   use_existing_browser_ = true;
   clear_profile_ = false;
-  std::wstring app_launch_arguments = launch_arguments_;
-  CommandLine::AppendSwitchWithValue(
-      &app_launch_arguments, switches::kApp, UTF8ToWide(url2.spec()));
+  CommandLine app_launch_arguments = launch_arguments_;
+  app_launch_arguments.AppendSwitchWithValue(switches::kApp,
+                                             UTF8ToWide(url2.spec()));
   LaunchBrowser(app_launch_arguments, false);
   int window_count;
   ASSERT_TRUE(automation()->WaitForWindowCountToChange(1, &window_count,
                                                        action_timeout_ms()));
   ASSERT_EQ(2, window_count);
 
   // Close the first window.
   CloseWindow(0, 2);
 
   // Restore it, which should bring back the first window with url1.
-  std::wstring restore_launch_arguments = launch_arguments_;
-  CommandLine::AppendSwitch(&restore_launch_arguments,
-                            switches::kRestoreLastSession);
+  CommandLine restore_launch_arguments = launch_arguments_;
+  restore_launch_arguments.AppendSwitch(switches::kRestoreLastSession);
   LaunchBrowser(restore_launch_arguments, false);
   ASSERT_TRUE(automation()->WaitForWindowCountToChange(1, &window_count,
                                                        action_timeout_ms()));
   ASSERT_EQ(2, window_count);
   GURL url;
   AssertWindowHasOneTab(1, &url);
   ASSERT_EQ(url1, url);
 }
 
 // TODO(sky): bug 1200852, this test is flakey, so I'm disabling.
@@ skipping 50 matching lines @@
   scoped_ptr<TabProxy> tab_proxy(browser_proxy->GetTab(restored_tab_count - 2));
   ASSERT_TRUE(tab_proxy.get() != NULL);
   ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms()));
   tab_proxy.reset(browser_proxy->GetTab(restored_tab_count - 1));
   ASSERT_TRUE(tab_proxy.get() != NULL);
   ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms()));
 
   ASSERT_EQ(expected_process_count, GetBrowserProcessCount());
 }