Reverting 23313.

Review URL: http://codereview.chromium.org/165463

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23314 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 19 deletions

diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc
index 7efe921..3e4dddc 100644
--- a/chrome/test/startup/feature_startup_test.cc
+++ b/chrome/test/startup/feature_startup_test.cc
@@ -43,8 +43,6 @@ class NewTabUIStartupTest : public UITest {
   // we should report cold timings.
   void RunStartupTest(const char* label, bool want_warm, bool important,
                       int profile_type) {
-    profile_type_ = profile_type;
-
     // Install the location of the test profile file.
     set_template_user_data(UITest::ComputeTypicalUserDataSource(
         profile_type).ToWStringHack());
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 59908a8..7a187de 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -29,15 +29,6 @@ class StartupTest : public UITest {
 
   void RunStartupTest(const char* graph, const char* trace,
       bool test_cold, bool important, int profile_type) {
-    profile_type_ = profile_type;
-
-    // Sets the profile data for the run.  For now, this is only used for
-    // the complex theme test.
-    if (profile_type == UITest::COMPLEX_THEME) {
-      set_template_user_data(UITest::ComputeTypicalUserDataSource(
-          profile_type).ToWStringHack());
-    }
-
     const int kNumCyclesMax = 20;
     int numCycles = kNumCyclesMax;
 // It's ok for unit test code to use getenv(), isn't it?
@@ -73,6 +64,13 @@ class StartupTest : public UITest {
         NOTIMPLEMENTED() << "gears not enabled yet";
 #endif
       }
+
+      // Sets the profile data for the run.  For now, this is only used for
+      // the complex theme test.
+      if (profile_type == UITest::COMPLEX_THEME)
+        set_template_user_data(UITest::ComputeTypicalUserDataSource(
+            profile_type).ToWStringHack());
+
       UITest::SetUp();
       TimeTicks end_time = TimeTicks::Now();
       timings[i] = end_time - browser_launch_time_;
@@ -85,10 +83,6 @@ class StartupTest : public UITest {
         // Re-use the profile data after first run so that the noise from
         // creating databases doesn't impact all the runs.
         clear_profile_ = false;
-        // Destroy template_user_data_ for complex theme so we don't try to
-        // rewrite each time through.
-        if (profile_type == UITest::COMPLEX_THEME)
-          set_template_user_data(L"");
       }
     }
 
@@ -167,9 +161,9 @@ TEST_F(StartupFileTest, PerfColdGears) {
 }
 #endif
 
-TEST_F(StartupTest, PerfColdComplexTheme) {
-  RunStartupTest("warm", "t-theme", false /* warm */,
-                 false /* not important */, UITest::COMPLEX_THEME);
-}
+//TEST_F(StartupTest, PerfColdComplexTheme) {
+//  RunStartupTest("warm", "t-theme", false /* warm */,
+//                 false /* not important */, UITest::COMPLEX_THEME);
+//}
 
 }  // namespace