Recommit the generate profile patch

chrome/test/perf/feature_startup_test.cc

 // Copyright (c) 2012 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/stringprintf.h"
 #include "base/time.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/perf/perf_test.h"
+#include "chrome/test/perf/perf_ui_test_suite.h"
 #include "chrome/test/ui/ui_perf_test.h"
 #include "net/base/net_util.h"
 #include "ui/gfx/rect.h"
 
 using base::TimeDelta;
 
 namespace {
 
 class NewTabUIStartupTest : public UIPerfTest {
  public:
   NewTabUIStartupTest() {
     show_window_ = true;
   }
 
   virtual void SetUp() {}
   virtual void TearDown() {}
 
   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());
     perf_test::PrintResultList(
         "new_tab", std::string(), label, times, "ms", important);
   }
 
-  void InitProfile(UITestBase::ProfileType profile_type) {
-    profile_type_ = profile_type;
-
+  void InitProfile(PerfUITestSuite::ProfileType profile_type) {
     // Install the location of the test profile file.
-    set_template_user_data(UITest::ComputeTypicalUserDataSource(
-        profile_type));
+    set_template_user_data(
+        PerfUITestSuite::GetPathForProfileType(profile_type));
   }
 
   // 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,
-                      UITestBase::ProfileType profile_type) {
+                      PerfUITestSuite::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(UITestBase::DEFAULT_THEME);
+    InitProfile(PerfUITestSuite::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 40 matching lines @@
     PrintTimings("domcontent_loaded", domcontentloaded_times,
                  false /* important */);
     PrintTimings("onload", onload_times, false /* important */);
   }
 };
 
 // FLAKY: http://crbug.com/69940
 TEST_F(NewTabUIStartupTest, DISABLED_PerfRefCold) {
   UseReferenceBuild();
   RunStartupTest("tab_cold_ref", false /* cold */, true /* important */,
-                 UITestBase::DEFAULT_THEME);
+                 PerfUITestSuite::DEFAULT_THEME);
 }
 
 // FLAKY: http://crbug.com/69940
 TEST_F(NewTabUIStartupTest, DISABLED_PerfCold) {
   RunStartupTest("tab_cold", false /* cold */, true /* important */,
-                 UITestBase::DEFAULT_THEME);
+                 PerfUITestSuite::DEFAULT_THEME);
 }
 
 // FLAKY: http://crbug.com/69940
 TEST_F(NewTabUIStartupTest, DISABLED_PerfRefWarm) {
   UseReferenceBuild();
   RunStartupTest("tab_warm_ref", true /* warm */, true /* not important */,
-                 UITestBase::DEFAULT_THEME);
+                 PerfUITestSuite::DEFAULT_THEME);
 }
 
 // FLAKY: http://crbug.com/69940
 TEST_F(NewTabUIStartupTest, DISABLED_PerfWarm) {
   RunStartupTest("tab_warm", true /* warm */, true /* not important */,
-                 UITestBase::DEFAULT_THEME);
+                 PerfUITestSuite::DEFAULT_THEME);
 }
 
 // FLAKY: http://crbug.com/69940
 TEST_F(NewTabUIStartupTest, DISABLED_ComplexThemeCold) {
   RunStartupTest("tab_complex_theme_cold", false /* cold */,
                  false /* not important */,
-                 UITestBase::COMPLEX_THEME);
+                 PerfUITestSuite::COMPLEX_THEME);
 }
 
 // FLAKY: http://crbug.com/69940
 TEST_F(NewTabUIStartupTest, DISABLED_NewTabTimingTestsCold) {
   RunNewTabTimingTest();
 }
 
 }  // namespace