summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test.h
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-13 16:49:47 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-13 16:49:47 +0000
commit574043bea0a1952fe90d1014eadaeb85976a1b05 (patch)
tree35ac364bbac7256bca450b724b136a0e56ab0d1e /chrome/test/ui/ui_test.h
parentb672d5fcce4beff54ff029ffd57b396c365d0bd2 (diff)
downloadchromium_src-574043bea0a1952fe90d1014eadaeb85976a1b05.zip
chromium_src-574043bea0a1952fe90d1014eadaeb85976a1b05.tar.gz
chromium_src-574043bea0a1952fe90d1014eadaeb85976a1b05.tar.bz2
Enable StartupTest.PerfColdComplexTheme, and add rewriting of Preference file to ensure that the images are picked up for the complex theme tests.
BUG= http://crbug.com/18767 TEST= none Review URL: http://codereview.chromium.org/164402 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.h')
-rw-r--r--chrome/test/ui/ui_test.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index a512fb7..2b49f82 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -342,6 +342,9 @@ class UITest : public testing::Test {
// for testing.
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);
+
// Called by some tests that wish to have a base profile to start from. This
// "user data directory" (containing one or more profiles) will be recursively
// copied into the user data directory for the test and the files will be
@@ -479,6 +482,8 @@ 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
+ // complex theme?
private:
base::Time test_start_time_; // Time the test was started