| Index: chrome/test/ui/ui_test.cc
|
| diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
|
| index 4a409ac8db9db93de93a3586ed216073a51c456e..767aed17d67ed1112d76136599f6d9f74084f957 100644
|
| --- a/chrome/test/ui/ui_test.cc
|
| +++ b/chrome/test/ui/ui_test.cc
|
| @@ -88,8 +88,7 @@ UITestBase::UITestBase()
|
| show_window_(false),
|
| clear_profile_(true),
|
| include_testing_id_(true),
|
| - enable_file_cookies_(true),
|
| - profile_type_(UITestBase::DEFAULT_THEME) {
|
| + enable_file_cookies_(true) {
|
| PathService::Get(chrome::DIR_APP, &browser_directory_);
|
| PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_);
|
| }
|
| @@ -103,8 +102,7 @@ UITestBase::UITestBase(MessageLoop::Type msg_loop_type)
|
| show_window_(false),
|
| clear_profile_(true),
|
| include_testing_id_(true),
|
| - enable_file_cookies_(true),
|
| - profile_type_(UITestBase::DEFAULT_THEME) {
|
| + enable_file_cookies_(true) {
|
| PathService::Get(chrome::DIR_APP, &browser_directory_);
|
| PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_);
|
| }
|
| @@ -414,29 +412,6 @@ 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);
|
|
|