diff options
author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 17:57:25 +0000 |
---|---|---|
committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 17:57:25 +0000 |
commit | d2ee25b6cb2cd1dd4267eb2a8972ef4a951caa29 (patch) | |
tree | b5288c14e50d57cd000c73974339d28a42958c5b /chrome/test/ui | |
parent | 619502c167f4f5ca4d5205f7a0de87a7ee2d1caf (diff) | |
download | chromium_src-d2ee25b6cb2cd1dd4267eb2a8972ef4a951caa29.zip chromium_src-d2ee25b6cb2cd1dd4267eb2a8972ef4a951caa29.tar.gz chromium_src-d2ee25b6cb2cd1dd4267eb2a8972ef4a951caa29.tar.bz2 |
Test startup of new tab page with a complex theme.
BUG= http://crbug.com/18767
TEST= none
Review URL: http://codereview.chromium.org/165168
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
-rw-r--r-- | chrome/test/ui/ui_test.cc | 19 | ||||
-rw-r--r-- | chrome/test/ui/ui_test.h | 10 |
2 files changed, 29 insertions, 0 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 25ec701..69de19a 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -963,3 +963,22 @@ bool UITest::EvictFileFromSystemCacheWrapper(const FilePath& path) { } return false; } + +// static +FilePath UITest::ComputeTypicalUserDataSource(int profile_type) { + FilePath source_history_file; + EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, + &source_history_file)); + if (profile_type == UITest::DEFAULT_THEME) { + source_history_file = source_history_file.AppendASCII("profiles") + .AppendASCII("typical_history"); + } else if (profile_type == UITest::COMPLEX_THEME) { + source_history_file = source_history_file.AppendASCII("profiles") + .AppendASCII("complex_theme"); + } else { + NOTREACHED(); + } + return source_history_file; +} + + diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h index 1d4374d..a512fb7 100644 --- a/chrome/test/ui/ui_test.h +++ b/chrome/test/ui/ui_test.h @@ -338,6 +338,10 @@ class UITest : public testing::Test { log_level_ = value; } + // Returns the directory name where the "typical" user data is that we use + // for testing. + static FilePath ComputeTypicalUserDataSource(int profile_type); + // 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 @@ -404,6 +408,12 @@ class UITest : public testing::Test { void StartHttpServer(const FilePath& root_directory); void StopHttpServer(); + // Profile theme type choices. + enum { + DEFAULT_THEME = 0, + COMPLEX_THEME = 1 + } ProfileType; + private: // Check that no processes related to Chrome exist, displaying // the given message if any do. |