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

Unified Diff: chrome/test/perf/startup_test.cc

Issue 10590004: [cros] Fake a stub user login when no --login-manager and --login-user are given. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 years, 5 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/base/testing_profile.cc ('k') | chrome/test/ui/ui_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/perf/startup_test.cc
diff --git a/chrome/test/perf/startup_test.cc b/chrome/test/perf/startup_test.cc
index e57715ac398cf06d05afdb20a4466b35639e6c9f..4001aebcb819608a073891c828848ca9a06e8558 100644
--- a/chrome/test/perf/startup_test.cc
+++ b/chrome/test/perf/startup_test.cc
@@ -19,6 +19,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/env_vars.h"
#include "chrome/test/automation/automation_proxy.h"
+#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/test_switches.h"
#include "chrome/test/base/ui_test_utils.h"
#include "chrome/test/perf/perf_test.h"
@@ -104,9 +105,11 @@ class StartupTest : public UIPerfTest {
if (profile_type_ != UITestBase::COMPLEX_THEME)
return;
- const FilePath pref_template_path(user_data_dir().AppendASCII("Default").
+ const FilePath pref_template_path(user_data_dir().
+ AppendASCII("Default").
AppendASCII("PreferencesTemplate"));
- const FilePath pref_path(user_data_dir().AppendASCII("Default").
+ const FilePath pref_path(user_data_dir().
+ AppendASCII(TestingProfile::kTestUserProfileDir).
AppendASCII("Preferences"));
// Read in preferences template.
« no previous file with comments | « chrome/test/base/testing_profile.cc ('k') | chrome/test/ui/ui_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698