CommandLine API rework

chrome/test/ui/ui_test.h

 // 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.
 
 #ifndef CHROME_TEST_UI_UI_TEST_H_
 #define CHROME_TEST_UI_UI_TEST_H_
 
 // This file provides a common base for running UI unit tests, which operate
 // the entire browser application in a separate process for holistic
 // functional testing.
 //
 // Tests should #include this file, subclass UITest, and use the TEST_F macro
 // to declare individual test cases.  This provides a running browser window
 // during the test, accessible through the window_ member variable.  The window
 // will close when the test ends, regardless of whether the test passed.
 //
 // Tests which need to launch the browser with a particular set of command-line
 // arguments should set the value of launch_arguments_ in their constructors.
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 #include <string>
 
+#include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #if defined(OS_WIN)
 // TODO(evanm): we should be able to just forward-declare
 // AutomationProxy here, but many files that #include this one don't
 // themselves #include automation_proxy.h.
 #include "chrome/test/automation/automation_proxy.h"
@@ skipping 31 matching lines @@
   // This differs from file_util::Delete in that it repeatedly invokes Delete
   // until successful, or a timeout is reached. Returns true on success.
   bool DieFileDie(const std::wstring& file, bool recurse);
 
   // Launches the browser and IPC testing server.
   void LaunchBrowserAndServer();
 
   // Closes the browser and IPC testing server.
   void CloseBrowserAndServer();
 
-  // Launches the browser with the given arguments.
-  void LaunchBrowser(const std::wstring& arguments, bool clear_profile);
+  // Launches the browser with the given command line.
+  void LaunchBrowser(const CommandLine& cmdline, bool clear_profile);
 
   // Exits out browser instance.
   void QuitBrowser();
 
   // Tells the browser to navigato to the givne URL in the active tab
   // of the first app window.
   // Does not wait for the navigation to complete to return.
   void NavigateToURLAsync(const GURL& url);
 
   // Tells the browser to navigate to the given URL in the active tab
@@ skipping 292 matching lines @@
   // tab or there was some kind of error. The returned pointer MUST be
   // deleted by the caller if non-NULL.
   TabProxy* GetActiveTab();
 
   // ********* Member variables *********
 
   std::wstring browser_directory_;      // Path to the browser executable,
                                         // with no trailing slash
   std::wstring test_data_directory_;    // Path to the unit test data,
                                         // with no trailing slash
-  std::wstring launch_arguments_;       // Arguments to the browser on launch.
+  CommandLine launch_arguments_;        // Command to launch the browser
   size_t expected_errors_;              // The number of errors expected during
                                         // the run (generally 0).
   int expected_crashes_;                // The number of crashes expected during
                                         // the run (generally 0).
   std::wstring homepage_;               // Homepage used for testing.
   bool wait_for_initial_loads_;         // Wait for initial loads to complete
                                         // in SetUp() before running test body.
   base::TimeTicks browser_launch_time_; // Time when the browser was run.
   bool dom_automation_enabled_;         // This can be set to true to have the
                                         // test run the dom automation case.
@@ skipping 56 matching lines @@
 #ifdef UNIT_TEST
 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr);
 
 template<typename T>
 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) {
   return out << ptr.get();
 }
 #endif  // UNIT_TEST
 
 #endif  // CHROME_TEST_UI_UI_TEST_H_