Recommit the generate profile patch

chrome/test/perf/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/environment.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/sys_info.h"
 #include "base/test/test_file_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.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 "content/public/common/content_switches.h"
 #include "net/base/net_util.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace {
 
 class StartupTest : public UIPerfTest {
@@ skipping 60 matching lines @@
     base::FilePath data_dir;
     PathService::Get(chrome::DIR_TEST_DATA, &data_dir);
     data_dir = data_dir.AppendASCII("extensions").AppendASCII("profiles").
         AppendASCII(profile);
     set_template_user_data(data_dir);
   }
 
   // Rewrite the preferences file to point to the proper image directory.
   virtual void SetUpProfile() OVERRIDE {
     UIPerfTest::SetUpProfile();
-    if (profile_type_ != UITestBase::COMPLEX_THEME)
+    if (profile_type_ != PerfUITestSuite::COMPLEX_THEME)
       return;
 
     const base::FilePath pref_template_path(user_data_dir().
         AppendASCII("Default").
         AppendASCII("PreferencesTemplate"));
     const base::FilePath pref_path(user_data_dir().
         AppendASCII(TestingProfile::kTestUserProfileDir).
         AppendASCII("Preferences"));
 
     // Read in preferences template.
@@ skipping 24 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,
-                      UITestBase::ProfileType profile_type,
+                      PerfUITestSuite::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 != UITestBase::DEFAULT_THEME) {
-      set_template_user_data(UITest::ComputeTypicalUserDataSource(
-          profile_type));
+    if (profile_type != PerfUITestSuite::DEFAULT_THEME) {
+      set_template_user_data(
+          PerfUITestSuite::GetPathForProfileType(profile_type));
     }
 
 #if defined(NDEBUG)
     const int kNumCyclesMax = 20;
 #else
     // Debug builds are too slow and we can't run that many cycles in a
     // reasonable amount of time.
     const int kNumCyclesMax = 10;
 #endif
     int numCycles = kNumCyclesMax;
@@ skipping 123 matching lines @@
           base::StringAppendF(&times, "%.2f,", timings[i].last_stop_ms);
         perf_test::PrintResultList(
             graph, std::string(), name.c_str(), times, "ms", important);
       }
     }
   }
 
   base::FilePath profiling_file_;
   bool collect_profiling_stats_;
   std::string trace_file_prefix_;
+
+  // Are we using a profile with a complex theme?
+  PerfUITestSuite::ProfileType profile_type_;
 };
 
 TEST_F(StartupTest, PerfWarm) {
   RunStartupTest("warm", "t", WARM, IMPORTANT,
-                 UITestBase::DEFAULT_THEME, 0, 0);
+                 PerfUITestSuite::DEFAULT_THEME, 0, 0);
 }
 
 TEST_F(StartupTest, PerfReferenceWarm) {
   UseReferenceBuild();
   RunStartupTest("warm", "t_ref", WARM, IMPORTANT,
-                 UITestBase::DEFAULT_THEME, 0, 0);
+                 PerfUITestSuite::DEFAULT_THEME, 0, 0);
 }
 
 // TODO(mpcomplete): Should we have reference timings for all these?
 
 // dominich: Disabling as per http://crbug.com/100900.
 #if defined(OS_WIN)
 #define MAYBE_PerfCold DISABLED_PerfCold
 #else
 #define MAYBE_PerfCold PerfCold
 #endif
 
 TEST_F(StartupTest, MAYBE_PerfCold) {
   RunStartupTest("cold", "t", COLD, NOT_IMPORTANT,
-                 UITestBase::DEFAULT_THEME, 0, 0);
+                 PerfUITestSuite::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) {
@@ skipping 15 matching lines @@
       new_launch_arguments.AppendSwitch(switches::kEnableChromiumBranding);
     }
     // 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.
     new_launch_arguments.AppendSwitchASCII(switches::kRestoreLastSession,
                                         base::IntToString(tab_count));
     launch_arguments_ = new_launch_arguments;
   }
   RunStartupTest(graph, trace, WARM, NOT_IMPORTANT,
-                 UITestBase::DEFAULT_THEME, tab_count, nth_timed_tab);
+                 PerfUITestSuite::DEFAULT_THEME, tab_count, nth_timed_tab);
 }
 
 // http://crbug.com/101591
 #if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_PerfFewTabs DISABLED_PerfFewTabs
 #else
 #define MAYBE_PerfFewTabs PerfFewTabs
 #endif
 
 TEST_F(StartupTest, MAYBE_PerfFewTabs) {
@@ skipping 62 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,
-                 UITestBase::DEFAULT_THEME, 1, 0);
+                 PerfUITestSuite::DEFAULT_THEME, 1, 0);
 }
 
 TEST_F(StartupTest, PerfExtensionContentScript1) {
   SetUpWithFileURL();
   SetUpWithExtensionsProfile("content_scripts1");
   RunStartupTest("warm", "extension_content_scripts1", WARM, NOT_IMPORTANT,
-                 UITestBase::DEFAULT_THEME, 1, 0);
+                 PerfUITestSuite::DEFAULT_THEME, 1, 0);
 }
 
 TEST_F(StartupTest, MAYBE_PerfExtensionContentScript50) {
   SetUpWithFileURL();
   SetUpWithExtensionsProfile("content_scripts50");
   RunStartupTest("warm", "extension_content_scripts50", WARM, NOT_IMPORTANT,
-                 UITestBase::DEFAULT_THEME, 1, 0);
+                 PerfUITestSuite::DEFAULT_THEME, 1, 0);
 }
 
 TEST_F(StartupTest, MAYBE_PerfComplexTheme) {
   RunStartupTest("warm", "t-theme", WARM, NOT_IMPORTANT,
-                 UITestBase::COMPLEX_THEME, 0, 0);
+                 PerfUITestSuite::COMPLEX_THEME, 0, 0);
 }
 
 TEST_F(StartupTest, ProfilingScript1) {
   SetUpWithFileURL();
   SetUpWithProfiling();
   RunStartupTest("warm", "profiling_scripts1", WARM, NOT_IMPORTANT,
-                 UITestBase::DEFAULT_THEME, 1, 0);
+                 PerfUITestSuite::DEFAULT_THEME, 1, 0);
 }
 
 }  // namespace