diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 17:52:17 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-15 17:52:17 +0000 |
| commit | a59db43dff855a13a5d1f57865f2afacfd2c6241 (patch) | |
| tree | 1fd8e2dee4b946169f620f69619d272606f844f0 /chrome/test/ui/ui_test.cc | |
| parent | df9f42a8eab0069a781a07019da66a5a2a094e66 (diff) | |
| download | chromium_src-a59db43dff855a13a5d1f57865f2afacfd2c6241.zip chromium_src-a59db43dff855a13a5d1f57865f2afacfd2c6241.tar.gz chromium_src-a59db43dff855a13a5d1f57865f2afacfd2c6241.tar.bz2 | |
Revert "Rebuild test history databases when starting up performance_ui_tests."
This reverts commit fd99334e881859262199c9b8a98f9fbb003b20e1.
BUG=111570
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.cc')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 8521934..a543327 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -88,7 +88,8 @@ UITestBase::UITestBase() show_window_(false), clear_profile_(true), include_testing_id_(true), - enable_file_cookies_(true) { + enable_file_cookies_(true), + profile_type_(UITestBase::DEFAULT_THEME) { PathService::Get(chrome::DIR_APP, &browser_directory_); PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_); } @@ -102,7 +103,8 @@ UITestBase::UITestBase(base::MessageLoop::Type msg_loop_type) show_window_(false), clear_profile_(true), include_testing_id_(true), - enable_file_cookies_(true) { + enable_file_cookies_(true), + profile_type_(UITestBase::DEFAULT_THEME) { PathService::Get(chrome::DIR_APP, &browser_directory_); PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_); } @@ -417,6 +419,29 @@ bool UITestBase::CloseBrowser(BrowserProxy* browser, return result; } +// static +base::FilePath UITestBase::ComputeTypicalUserDataSource( + UITestBase::ProfileType profile_type) { + base::FilePath source_history_file; + EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, + &source_history_file)); + source_history_file = source_history_file.AppendASCII("profiles"); + switch (profile_type) { + case UITestBase::DEFAULT_THEME: + source_history_file = source_history_file.AppendASCII( + "profile_with_default_theme"); + break; + case UITestBase::COMPLEX_THEME: + source_history_file = source_history_file.AppendASCII( + "profile_with_complex_theme"); + break; + default: + NOTREACHED(); + } + + return source_history_file; +} + int UITestBase::GetCrashCount() const { base::FilePath crash_dump_path; PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_path); |