diff options
author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 00:16:15 +0000 |
---|---|---|
committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 00:16:15 +0000 |
commit | 1cc48f14278f4bb882d633ab4776b09478e7f668 (patch) | |
tree | 94ddd4801b3a78bbdc2b12069a19ab7936583e99 /chrome/test/ui/ui_test.h | |
parent | 551d976c7518976334d2bb2dfe978c7b28678172 (diff) | |
download | chromium_src-1cc48f14278f4bb882d633ab4776b09478e7f668.zip chromium_src-1cc48f14278f4bb882d633ab4776b09478e7f668.tar.gz chromium_src-1cc48f14278f4bb882d633ab4776b09478e7f668.tar.bz2 |
Add startup tests that log start script, domcontentloaded, and onload.
TabContents sends a notification which is picked up by the browser
automation controller which keeps a map of events and times. Add
an automation IPC so that tests can get these values from the
browser automation controller. Finally, add a feature startup test
to collect these values.
This is just to get some consistent timings from the buildbot.
BUG=23120
Review URL: http://codereview.chromium.org/246105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.h')
-rw-r--r-- | chrome/test/ui/ui_test.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h index 5c45e8c..c87ffe1 100644 --- a/chrome/test/ui/ui_test.h +++ b/chrome/test/ui/ui_test.h @@ -362,9 +362,18 @@ 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(int profile_type); + static FilePath ComputeTypicalUserDataSource(ProfileType profile_type); // Rewrite the preferences file to point to the proper image directory. static void RewritePreferencesFile(const FilePath& user_data_dir); @@ -443,15 +452,6 @@ 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. - int profile_type_; // Are we using a profile with a + ProfileType profile_type_; // Are we using a profile with a // complex theme? private: |