chrome/test/perf/startup_test.cc - Issue 10590004: [cros] Fake a stub user login when no --login-manager and --login-user are given.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Review comments and mock expectations. Created 8 years, 6 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

« chrome/browser/profiles/profile_manager.cc ('K') | « chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc ('k') | chromeos/dbus/mock_dbus_thread_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 701c1a8883e6431113feecf3c828197db5776c15..422c0674d73027915922aa2c024e0d782b5c08f1 100644

--- a/chrome/test/perf/startup_test.cc

+++ b/chrome/test/perf/startup_test.cc

@@ -14,6 +14,7 @@

#include "base/test/test_timeouts.h"

#include "base/time.h"

#include "base/utf_string_conversions.h"

+#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

@@ -92,9 +93,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(ProfileManager::kTestUserProfile).

AppendASCII("Preferences"));

// Read in preferences template.