Revert "Add startup tests that log start script, domcontentloaded, and onload."

which failed on XP Perf (single).

This reverts commit r28199.

TBR=tony

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

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

2 files changed, 12 insertions, 12 deletions

diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 653b58d..eac4367 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -927,7 +927,7 @@ void UITest::RewritePreferencesFile(const FilePath& user_data_dir) {
 }
 
 // static
-FilePath UITest::ComputeTypicalUserDataSource(ProfileType profile_type) {
+FilePath UITest::ComputeTypicalUserDataSource(int profile_type) {
   FilePath source_history_file;
   EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA,
                                &source_history_file));
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index c87ffe1..5c45e8c 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -362,18 +362,9 @@ class UITest : public testing::Test {
     log_level_ = value;
   }
 
-  // Profile theme type choices.
-  typedef enum {
-    DEFAULT_THEME = 0,
-    COMPLEX_THEME = 1,
-    NATIVE_THEME = 2,
-    CUSTOM_FRAME = 3,
-    CUSTOM_FRAME_NATIVE_THEME = 4,
-  } ProfileType;
-
   // Returns the directory name where the "typical" user data is that we use
   // for testing.
-  static FilePath ComputeTypicalUserDataSource(ProfileType profile_type);
+  static FilePath ComputeTypicalUserDataSource(int profile_type);
 
   // Rewrite the preferences file to point to the proper image directory.
   static void RewritePreferencesFile(const FilePath& user_data_dir);
@@ -452,6 +443,15 @@ class UITest : public testing::Test {
   void StartHttpServer(const FilePath& root_directory);
   void StopHttpServer();
 
+  // Profile theme type choices.
+  typedef enum {
+    DEFAULT_THEME = 0,
+    COMPLEX_THEME = 1,
+    NATIVE_THEME = 2,
+    CUSTOM_FRAME = 3,
+    CUSTOM_FRAME_NATIVE_THEME = 4,
+  } ProfileType;
+
  private:
   // Check that no processes related to Chrome exist, displaying
   // the given message if any do.
@@ -518,7 +518,7 @@ class UITest : public testing::Test {
   bool use_existing_browser_;           // Duplicate of the static version.
                                         // Default value comes from static.
   bool enable_file_cookies_;            // Enable file cookies, default is true.
-  ProfileType profile_type_;            // Are we using a profile with a
+  int profile_type_;                    // Are we using a profile with a
                                         // complex theme?
 
  private: