Refactor UITestBase/ProxyLauncher.

chrome/test/ui/ui_test.h

 // Copyright (c) 2010 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_
 #pragma once
 
 // This file provides a common base for running UI unit tests, which operate
 // the entire browser application in a separate process for holistic
@@ skipping 13 matching lines @@
 #include "base/message_loop.h"
 #include "base/process.h"
 #include "base/scoped_ptr.h"
 #include "base/test/test_timeouts.h"
 #include "base/time.h"
 #include "build/build_config.h"
 // 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"
+#include "chrome/test/automation/proxy_launcher.h"
 #include "testing/platform_test.h"
 
 class AutomationProxy;
 class BrowserProxy;
 class DictionaryValue;
 class FilePath;
 class GURL;
-class ProxyLauncher;
 class ScopedTempDir;
 class TabProxy;
 
 // Base class for UI Tests. This implements the core of the functions.
 // This base class decouples all automation functionality from testing
 // infrastructure, for use without gtest.
 // If using gtest, you probably want to inherit from UITest (declared below)
 // rather than UITestBase.
 class UITestBase {
  protected:
@@ skipping 148 matching lines @@
   bool CloseBrowser(BrowserProxy* browser, bool* application_closed) const;
 
   // Gets the directory for the currently active profile in the browser.
   FilePath GetDownloadDirectory();
 
   // Get the handle of browser process connected to the automation. This
   // function only retruns a reference to the handle so the caller does not
   // own the handle returned.
   base::ProcessHandle process() { return process_; }
 
-  // Get/Set a flag to run the renderer in process when running the
-  // tests.
-  static bool in_process_renderer() { return in_process_renderer_; }
-  static void set_in_process_renderer(bool value) {
-    in_process_renderer_ = value;
-  }
-
-  // Get/Set a flag to run the renderer outside the sandbox when running the
-  // tests
-  static bool no_sandbox() { return no_sandbox_; }
-  static void set_no_sandbox(bool value) {
-    no_sandbox_ = value;
-  }
-
-  // Get/Set a flag to run with DCHECKs enabled in release.
-  static bool enable_dcheck() { return enable_dcheck_; }
-  static void set_enable_dcheck(bool value) {
-    enable_dcheck_ = value;
-  }
-
-  // Get/Set a flag to dump the process memory without crashing on DCHECKs.
-  static bool silent_dump_on_dcheck() { return silent_dump_on_dcheck_; }
-  static void set_silent_dump_on_dcheck(bool value) {
-    silent_dump_on_dcheck_ = value;
-  }
-
-  // Get/Set a flag to disable breakpad handling.
-  static bool disable_breakpad() { return disable_breakpad_; }
-  static void set_disable_breakpad(bool value) {
-    disable_breakpad_ = value;
-  }
-
-  // Get/Set a flag to run the plugin processes inside the sandbox when running
-  // the tests
-  static bool safe_plugins() { return safe_plugins_; }
-  static void set_safe_plugins(bool value) {
-    safe_plugins_ = value;
-  }
-
-  static bool show_error_dialogs() { return show_error_dialogs_; }
-  static void set_show_error_dialogs(bool value) {
-    show_error_dialogs_ = value;
-  }
-
-  static bool full_memory_dump() { return full_memory_dump_; }
-  static void set_full_memory_dump(bool value) {
-    full_memory_dump_ = value;
-  }
-
-  static bool dump_histograms_on_exit() { return dump_histograms_on_exit_; }
-  static void set_dump_histograms_on_exit(bool value) {
-    dump_histograms_on_exit_ = value;
-  }
-
-  static const std::string& js_flags() { return js_flags_; }
-  static void set_js_flags(const std::string& value) {
-    js_flags_ = value;
-  }
-
-  static const std::string& log_level() { return log_level_; }
-  static void set_log_level(const std::string& value) {
-    log_level_ = value;
-  }
-
-  // Profile theme type choices.
-  typedef enum {
-    DEFAULT_THEME = 0,
-    COMPLEX_THEME = 1,
-    NATIVE_THEME = 2,
-    CUSTOM_FRAME = 3,
-    CUSTOM_FRAME_NATIVE_THEME = 4,
-  } ProfileType;
-
   // Returns the directory name where the "typical" user data is that we use
   // for testing.
-  static FilePath ComputeTypicalUserDataSource(ProfileType profile_type);
+  static FilePath ComputeTypicalUserDataSource(
+      ProxyLauncher::ProfileType profile_type);
 
-  // Rewrite the preferences file to point to the proper image directory.
-  static void RewritePreferencesFile(const FilePath& user_data_dir);
+  // Return the user data directory being used by the browser instance in
+  // UITest::SetUp().
+  FilePath user_data_dir() const {
+    return launcher_->user_data_dir();
+  }
 
   // Called by some tests that wish to have a base profile to start from. This
   // "user data directory" (containing one or more profiles) will be recursively
   // copied into the user data directory for the test and the files will be
   // evicted from the OS cache. To start with a blank profile, supply an empty
   // string (the default).
   const FilePath& template_user_data() const { return template_user_data_; }
   void set_template_user_data(const FilePath& template_user_data) {
     template_user_data_ = template_user_data;
   }
 
-  // Return the user data directory being used by the browser instance in
-  // UITest::SetUp().
-  FilePath user_data_dir() const;
-
   // Return the process id of the browser process (-1 on error).
   base::ProcessId browser_process_id() const { return process_id_; }
 
   // Compatibility timeout accessors.
   // TODO(phajdan.jr): update callers and remove these.
   static int command_execution_timeout_ms() {
     return TestTimeouts::command_execution_timeout_ms();
   }
   static int action_timeout_ms() {
     return TestTimeouts::action_timeout_ms();
   }
   static int action_max_timeout_ms() {
     return TestTimeouts::action_max_timeout_ms();
   }
   static int sleep_timeout_ms() {
     // TODO(phajdan.jr): Fix all callers and remove sleep_timeout_ms.
     return TestTimeouts::action_timeout_ms();
   }
   static int test_timeout_ms() {
     return TestTimeouts::huge_test_timeout_ms();
   }
 
   void set_ui_test_name(const std::string& name) {
-    ui_test_name_ = name;
+    launcher_->set_ui_test_name(name);
   }
 
   // Fetch the state which determines whether the profile will be cleared on
   // next startup.
   bool get_clear_profile() const {
     return clear_profile_;
   }
   // Sets clear_profile_. Should be called before launching browser to have
   // any effect.
   void set_clear_profile(bool clear_profile) {
     clear_profile_ = clear_profile;
   }
 
   // Sets homepage_. Should be called before launching browser to have
   // any effect.
   void set_homepage(const std::string& homepage) {
-    homepage_ = homepage;
+    launcher_->set_homepage(homepage);
   }
 
-  // Different ways to quit the browser.
-  typedef enum {
-    WINDOW_CLOSE,
-    USER_QUIT,
-    SESSION_ENDING,
-  } ShutdownType;
-
   // Sets the shutdown type, which defaults to WINDOW_CLOSE.
-  void set_shutdown_type(ShutdownType value) {
+  void set_shutdown_type(ProxyLauncher::ShutdownType value) {
     shutdown_type_ = value;
   }
 
   // Get the number of crash dumps we've logged since the test started.
   int GetCrashCount();
 
   // Use Chromium binaries from the given directory.
   void SetBrowserDirectory(const FilePath& dir);
 
- private:
-  // Check that no processes related to Chrome exist, displaying
-  // the given message if any do.
-  void AssertAppNotRunning(const std::wstring& error_message);
-
  protected:
-  AutomationProxy* automation() {
-    EXPECT_TRUE(automation_proxy_.get());
-    return automation_proxy_.get();
+  AutomationProxy* automation() const {
+    return launcher_->automation();
   }
 
   virtual bool ShouldFilterInet() {
     return true;
   }
 
+  // Extra command-line switches that need to be passed to the browser are
+  // added in this function. Add new command-line switches here.
+  void SetLaunchSwitches();
+
+  // Helper function for SetLaunchSwitches() that
+  // adds a switch if it's not already there.
+  void SetLaunchSwitch(const std::string& switch_string);
+
   // Wait a certain amount of time for all the app processes to exit,
   // forcibly killing them if they haven't exited by then.
   // It has the side-effect of killing every browser window opened in your
   // session, even those unrelated in the test.
   void CleanupAppProcesses();
 
   // Returns the proxy for the currently active tab, or NULL if there is no
   // tab or there was some kind of error. Only looks at the first window, for
   // backward compatibility. The returned pointer MUST be deleted by the
   // caller if non-NULL.
   scoped_refptr<TabProxy> GetActiveTab();
 
   // Like above, but looks at the window at the given index.
   scoped_refptr<TabProxy> GetActiveTab(int window_index);
 
   // ********* Member variables *********
 
   FilePath browser_directory_;          // Path to the browser executable.
   FilePath test_data_directory_;        // Path to the unit test data.
   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::string 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.
   base::TimeDelta browser_quit_time_;   // How long the shutdown took.
   bool dom_automation_enabled_;         // This can be set to true to have the
                                         // test run the dom automation case.
   FilePath template_user_data_;         // See set_template_user_data().
   base::ProcessHandle process_;         // Handle to the first Chrome process.
   base::ProcessId process_id_;          // PID of |process_| (for debugging).
-  static bool in_process_renderer_;     // true if we're in single process mode
   bool show_window_;                    // Determines if the window is shown or
                                         // hidden. Defaults to hidden.
   bool clear_profile_;                  // If true the profile is cleared before
                                         // launching. Default is true.
   bool include_testing_id_;             // Should we supply the testing channel
                                         // id on the command line? Default is
                                         // true.
   bool enable_file_cookies_;            // Enable file cookies, default is true.
   scoped_ptr<ProxyLauncher> launcher_;  // Launches browser and AutomationProxy.
-  ProfileType profile_type_;            // Are we using a profile with a
+  ProxyLauncher::ProfileType profile_type_;  // Are we using a profile with a

[Paweł Hajdan Jr., 2011/01/05 21:47:59]

nit: Could you move the comments above the member variables instead of to the
right?

[dtu, 2011/01/06 01:41:13]

Done.

                                         // complex theme?
   FilePath websocket_pid_file_;         // PID file for websocket server.
-  ShutdownType shutdown_type_;          // The method for shutting down
+  ProxyLauncher::ShutdownType shutdown_type_;  // The method for shutting down
                                         // the browser. Used in ShutdownTest.
 
  private:
-  void WaitForBrowserLaunch();
-
-  bool LaunchBrowserHelper(const CommandLine& arguments,
-                           bool wait,
-                           base::ProcessHandle* process);
-
-  // Prepare command line that will be used to launch the child browser process
-  // with an UI test.
-  void PrepareTestCommandline(CommandLine* arguments);
-
-  // We want to have a current history database when we start the browser so
-  // things like the NTP will have thumbnails.  This method updates the dates
-  // in the history to be more recent.
-  void UpdateHistoryDates();
-
   base::Time test_start_time_;          // Time the test was started
                                         // (so we can check for new crash dumps)
-  static bool no_sandbox_;
-  static bool safe_plugins_;
-  static bool full_memory_dump_;        // If true, write full memory dump
-                                        // during crash.
-  static bool show_error_dialogs_;      // If true, a user is paying attention
-                                        // to the test, so show error dialogs.
-  static bool dump_histograms_on_exit_;  // Include histograms in log on exit.
-  static bool enable_dcheck_;           // Enable dchecks in release mode.
-  static bool silent_dump_on_dcheck_;   // Dump process memory on dcheck without
-                                        // crashing.
-  static bool disable_breakpad_;        // Disable breakpad on the browser.
-  static int timeout_ms_;               // Timeout in milliseconds to wait
-                                        // for an test to finish.
-  static std::string js_flags_;         // Flags passed to the JS engine.
-  static std::string log_level_;        // Logging level.
-
-  scoped_ptr<AutomationProxy> automation_proxy_;
-
-  std::string ui_test_name_;
-
-  // We use a temporary directory for profile to avoid issues with being
-  // unable to delete some files because they're in use, etc.
-  scoped_ptr<ScopedTempDir> temp_profile_dir_;
 };
 
 class UITest : public UITestBase, public PlatformTest {
  protected:
   UITest() {}
   explicit UITest(MessageLoop::Type msg_loop_type)
     : UITestBase(), PlatformTest(), message_loop_(msg_loop_type) {
   }
   virtual void SetUp();
   virtual void TearDown();
@@ skipping 109 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_