Refactor UITestBase/ProxyLauncher.

chrome/test/startup/startup_test.cc

 // 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.
 
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 72 matching lines @@
 
   // Runs a test which loads |tab_count| tabs on startup, either as command line
   // arguments or, if |restore_session| is true, by using session restore.
   // |nth_timed_tab|, if non-zero, will measure time to load the first n+1 tabs.
   void RunPerfTestWithManyTabs(const char* graph, const char* trace,
                                int tab_count, int nth_timed_tab,
                                bool restore_session);
 
   void RunStartupTest(const char* graph, const char* trace,
                       TestColdness test_cold, TestImportance test_importance,
-                      UITest::ProfileType profile_type,
+                      ProxyLauncher::ProfileType profile_type,
                       int num_tabs, int nth_timed_tab) {
     bool important = (test_importance == IMPORTANT);
     profile_type_ = profile_type;
 
     // Sets the profile data for the run.  For now, this is only used for
     // the non-default themes test.
-    if (profile_type != UITest::DEFAULT_THEME) {
+    if (profile_type != ProxyLauncher::DEFAULT_THEME) {
       set_template_user_data(UITest::ComputeTypicalUserDataSource(
           profile_type));
     }
 
     const int kNumCyclesMax = 20;
     int numCycles = kNumCyclesMax;
     scoped_ptr<base::Environment> env(base::Environment::Create());
     std::string numCyclesEnv;
     if (env->GetVar(env_vars::kStartupTestsNumCycles, &numCyclesEnv) &&
         base::StringToInt(numCyclesEnv, &numCycles)) {
@@ skipping 69 matching lines @@
           timings[i].first_start_ms = min_start;
           timings[i].last_stop_ms = max_stop;
           timings[i].first_stop_ms = times[0];
           timings[i].nth_tab_stop_ms = times[nth_timed_tab];
         } else {
           // Browser might not support initial load times.
           // Only use end-to-end time for this test.
           num_tabs = 0;
         }
       }
-      timings[i].end_to_end = end_time - browser_launch_time_;
+      timings[i].end_to_end = end_time - browser_launch_time();
       UITest::TearDown();
 
       if (i == 0) {
         // Re-use the profile data after first run so that the noise from
         // creating databases doesn't impact all the runs.
         clear_profile_ = false;
         // Clear template_user_data_ so we don't try to copy it over each time
         // through.
         set_template_user_data(FilePath());
       }
@@ skipping 38 matching lines @@
         name = name_base + "-all";
         for (int i = 0; i < numCycles; ++i)
           base::StringAppendF(&times, "%.2f,", timings[i].last_stop_ms);
         PrintResultList(graph, "", name.c_str(), times, "ms", important);
       }
     }
   }
 };
 
 TEST_F(StartupTest, PerfWarm) {
-  RunStartupTest("warm", "t", WARM, IMPORTANT, UITest::DEFAULT_THEME, 0, 0);
+  RunStartupTest("warm", "t", WARM, IMPORTANT,
+                 ProxyLauncher::DEFAULT_THEME, 0, 0);
 }
 
 TEST_F(StartupTest, PerfReferenceWarm) {
   UseReferenceBuild();
-  RunStartupTest("warm", "t_ref", WARM, IMPORTANT, UITest::DEFAULT_THEME, 0, 0);
+  RunStartupTest("warm", "t_ref", WARM, IMPORTANT,
+                 ProxyLauncher::DEFAULT_THEME, 0, 0);
 }
 
 // TODO(mpcomplete): Should we have reference timings for all these?
 
 TEST_F(StartupTest, PerfCold) {
-  RunStartupTest("cold", "t", COLD, NOT_IMPORTANT, UITest::DEFAULT_THEME, 0, 0);
+  RunStartupTest("cold", "t", COLD, NOT_IMPORTANT,
+                 ProxyLauncher::DEFAULT_THEME, 0, 0);
 }
 
 void StartupTest::RunPerfTestWithManyTabs(const char* graph, const char* trace,
                                           int tab_count, int nth_timed_tab,
                                           bool restore_session) {
   // Initialize session with |tab_count| tabs.
   for (int i = 0; i < tab_count; ++i)
     SetUpWithComplexFileURL(i);
 
   if (restore_session) {
     // Start the browser with these urls so we can save the session and exit.
     UITest::SetUp();
     // Set flags to ensure profile is saved and can be restored.
 #if defined(OS_MACOSX)
-    shutdown_type_ = UITestBase::USER_QUIT;
+    shutdown_type_ = ProxyLauncher::USER_QUIT;
 #endif
     clear_profile_ = false;
     // Quit and set flags to restore session.
     UITest::TearDown();
     // Clear all arguments for session restore, or the number of open tabs
     // will grow with each restore.
     launch_arguments_ = CommandLine(CommandLine::NO_PROGRAM);
     // The session will be restored once per cycle for numCycles test cycles,
     // and each time, UITest::SetUp will wait for |tab_count| tabs to
     // finish loading.
     launch_arguments_.AppendSwitchASCII(switches::kRestoreLastSession,
                                         base::IntToString(tab_count));
   }
-  RunStartupTest(graph, trace, WARM, NOT_IMPORTANT, UITest::DEFAULT_THEME,
-                 tab_count, nth_timed_tab);
+  RunStartupTest(graph, trace, WARM, NOT_IMPORTANT,
+                 ProxyLauncher::DEFAULT_THEME, tab_count, nth_timed_tab);
 }
 
 TEST_F(StartupTest, PerfFewTabs) {
   RunPerfTestWithManyTabs("few_tabs", "cmdline", 5, 2, false);
 }
 
 TEST_F(StartupTest, PerfFewTabsReference) {
   UseReferenceBuild();
   RunPerfTestWithManyTabs("few_tabs", "cmdline-ref", 5, 2, false);
 }
@@ skipping 42 matching lines @@
 
 TEST_F(StartupTest, PerfRestoreSeveralTabsReference) {
   UseReferenceBuild();
   RunPerfTestWithManyTabs("several_tabs", "restore-ref", 10, 4, true);
 }
 
 TEST_F(StartupTest, PerfExtensionEmpty) {
   SetUpWithFileURL();
   SetUpWithExtensionsProfile("empty");
   RunStartupTest("warm", "extension_empty", WARM, NOT_IMPORTANT,
-                 UITest::DEFAULT_THEME, 1, 0);
+                 ProxyLauncher::DEFAULT_THEME, 1, 0);
 }
 
 TEST_F(StartupTest, PerfExtensionContentScript1) {
   SetUpWithFileURL();
   SetUpWithExtensionsProfile("content_scripts1");
   RunStartupTest("warm", "extension_content_scripts1", WARM, NOT_IMPORTANT,
-                 UITest::DEFAULT_THEME, 1, 0);
+                 ProxyLauncher::DEFAULT_THEME, 1, 0);
 }
 
 TEST_F(StartupTest, MAYBE_PerfExtensionContentScript50) {
   SetUpWithFileURL();
   SetUpWithExtensionsProfile("content_scripts50");
   RunStartupTest("warm", "extension_content_scripts50", WARM, NOT_IMPORTANT,
-                 UITest::DEFAULT_THEME, 1, 0);
+                 ProxyLauncher::DEFAULT_THEME, 1, 0);
 }
 
 #if defined(OS_WIN)
 // TODO(port): Enable gears tests on linux/mac once gears is working.
 TEST_F(StartupTest, PerfGears) {
   SetUpWithFileURL();
   RunStartupTest("warm", "gears", WARM, NOT_IMPORTANT,
-                 UITest::DEFAULT_THEME, 1, 0);
+                 ProxyLauncher::DEFAULT_THEME, 1, 0);
 }
 
 TEST_F(StartupTest, PerfColdGears) {
   SetUpWithFileURL();
   RunStartupTest("cold", "gears", COLD, NOT_IMPORTANT,
-                 UITest::DEFAULT_THEME, 1, 0);
+                 ProxyLauncher::DEFAULT_THEME, 1, 0);
 }
 #endif
 
 TEST_F(StartupTest, PerfComplexTheme) {
   RunStartupTest("warm", "t-theme", WARM, NOT_IMPORTANT,
-                 UITest::COMPLEX_THEME, 0, 0);
+                 ProxyLauncher::COMPLEX_THEME, 0, 0);
 }
 
 #if defined(OS_LINUX)
 TEST_F(StartupTest, PerfGtkTheme) {
   RunStartupTest("warm", "gtk-theme", WARM, NOT_IMPORTANT,
-                 UITest::NATIVE_THEME, 0, 0);
+                 ProxyLauncher::NATIVE_THEME, 0, 0);
 }
 
 TEST_F(StartupTest, PrefNativeFrame) {
   RunStartupTest("warm", "custom-frame", WARM, NOT_IMPORTANT,
-                 UITest::CUSTOM_FRAME, 0, 0);
+                 ProxyLauncher::CUSTOM_FRAME, 0, 0);
 }
 
 TEST_F(StartupTest, PerfNativeFrameGtkTheme) {
   RunStartupTest("warm", "custom-frame-gtk-theme", WARM, NOT_IMPORTANT,
-                 UITest::CUSTOM_FRAME_NATIVE_THEME, 0, 0);
+                 ProxyLauncher::CUSTOM_FRAME_NATIVE_THEME, 0, 0);
 }
 #endif
 
 }  // namespace