Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4808)

Unified Diff: chrome/test/ui/ui_test.cc

Issue 14585015: Recommit the generate profile patch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Load the browser dll manually on Windows. Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/ui/ui_test.h ('k') | chrome/tools/profiles/generate_profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/ui_test.cc
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 20c6b6b40ab7f4b378d82666b71f3240c6247d02..2a3d56b84900207cf7b9c125d5ad4752098b2284 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(base::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_);
}
@@ -419,29 +417,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);
« no previous file with comments | « chrome/test/ui/ui_test.h ('k') | chrome/tools/profiles/generate_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698