Refactor UITestBase/ProxyLauncher.

chrome/test/startup/feature_startup_test.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/file_util.h"
 #include "base/path_service.h"
 #include "base/perftimer.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 21 matching lines @@
   static const int kNumCycles = 5;
 
   void PrintTimings(const char* label, TimeDelta timings[kNumCycles],
                     bool important) {
     std::string times;
     for (int i = 0; i < kNumCycles; ++i)
       base::StringAppendF(&times, "%.2f,", timings[i].InMillisecondsF());
     PrintResultList("new_tab", "", label, times, "ms", important);
   }
 
-  void InitProfile(UITest::ProfileType profile_type) {
+  void InitProfile(ProxyLauncher::ProfileType profile_type) {
     profile_type_ = profile_type;
 
     // Install the location of the test profile file.
     set_template_user_data(UITest::ComputeTypicalUserDataSource(
         profile_type));
 
     // Disable the first run notification because it has an animation which
     // masks any real performance regressions.
     launch_arguments_.AppendSwitch(switches::kDisableNewTabFirstRun);
   }
 
   // Run the test, by bringing up a browser and timing the new tab startup.
   // |want_warm| is true if we should output warm-disk timings, false if
   // we should report cold timings.
   void RunStartupTest(const char* label, bool want_warm, bool important,
-                      UITest::ProfileType profile_type) {
+                      ProxyLauncher::ProfileType profile_type) {
     InitProfile(profile_type);
 
     TimeDelta timings[kNumCycles];
     for (int i = 0; i < kNumCycles; ++i) {
       UITest::SetUp();
 
       // Switch to the "new tab" tab, which should be any new tab after the
       // first (the first is about:blank).
       scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
       ASSERT_TRUE(window.get());
@@ skipping 27 matching lines @@
       timings[i] = TimeDelta::FromMilliseconds(load_time);
 
       window = NULL;
       UITest::TearDown();
     }
 
     PrintTimings(label, timings, important);
   }
 
   void RunNewTabTimingTest() {
-    InitProfile(UITest::DEFAULT_THEME);
+    InitProfile(ProxyLauncher::DEFAULT_THEME);
 
     TimeDelta scriptstart_times[kNumCycles];
     TimeDelta domcontentloaded_times[kNumCycles];
     TimeDelta onload_times[kNumCycles];
 
     for (int i = 0; i < kNumCycles; ++i) {
       UITest::SetUp();
 
       // Switch to the "new tab" tab, which should be any new tab after the
       // first (the first is about:blank).
@@ skipping 39 matching lines @@
     PrintTimings("script_start", scriptstart_times, false /* important */);
     PrintTimings("domcontent_loaded", domcontentloaded_times,
                  false /* important */);
     PrintTimings("onload", onload_times, false /* important */);
   }
 };
 
 TEST_F(NewTabUIStartupTest, PerfRefCold) {
   UseReferenceBuild();
   RunStartupTest("tab_cold_ref", false /* cold */, true /* important */,
-                 UITest::DEFAULT_THEME);
+                 ProxyLauncher::DEFAULT_THEME);
 }
 
 TEST_F(NewTabUIStartupTest, PerfCold) {
   RunStartupTest("tab_cold", false /* cold */, true /* important */,
-                 UITest::DEFAULT_THEME);
+                 ProxyLauncher::DEFAULT_THEME);
 }
 
 TEST_F(NewTabUIStartupTest, PerfRefWarm) {
   UseReferenceBuild();
   RunStartupTest("tab_warm_ref", true /* warm */, true /* not important */,
-                 UITest::DEFAULT_THEME);
+                 ProxyLauncher::DEFAULT_THEME);
 }
 
 TEST_F(NewTabUIStartupTest, PerfWarm) {
   RunStartupTest("tab_warm", true /* warm */, true /* not important */,
-                 UITest::DEFAULT_THEME);
+                 ProxyLauncher::DEFAULT_THEME);
 }
 
 TEST_F(NewTabUIStartupTest, ComplexThemeCold) {
   RunStartupTest("tab_complex_theme_cold", false /* cold */,
                  false /* not important */,
-                 UITest::COMPLEX_THEME);
+                 ProxyLauncher::COMPLEX_THEME);
 }
 
 TEST_F(NewTabUIStartupTest, NewTabTimingTestsCold) {
   RunNewTabTimingTest();
 }
 
 #if defined(OS_LINUX)
 TEST_F(NewTabUIStartupTest, GtkThemeCold) {
   RunStartupTest("tab_gtk_theme_cold", false /* cold */,
                  false /* not important */,
-                 UITest::NATIVE_THEME);
+                 ProxyLauncher::NATIVE_THEME);
 }
 
 TEST_F(NewTabUIStartupTest, NativeFrameCold) {
   RunStartupTest("tab_custom_frame_cold", false /* cold */,
                  false /* not important */,
-                 UITest::CUSTOM_FRAME);
+                 ProxyLauncher::CUSTOM_FRAME);
 }
 
 TEST_F(NewTabUIStartupTest, NativeFrameGtkThemeCold) {
   RunStartupTest("tab_custom_frame_gtk_theme_cold", false /* cold */,
                  false /* not important */,
-                 UITest::CUSTOM_FRAME_NATIVE_THEME);
+                 ProxyLauncher::CUSTOM_FRAME_NATIVE_THEME);
 }
 #endif
 
 }  // namespace