chrome/browser/prefs/pref_service_browsertest.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/browser/prefs/pref_service_browsertest.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: Further test fixes. 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/chromeos/system/drm_settings.cc ('K') | « chrome/browser/extensions/extension_startup_browsertest.cc ('k') | chrome/browser/profiles/profile_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/pref_service_browsertest.cc

diff --git a/chrome/browser/prefs/pref_service_browsertest.cc b/chrome/browser/prefs/pref_service_browsertest.cc

index 9090454363dcaea73a4e315718cc7b9361bdb799..151ff60dfcb932f87c9fd54d16c417bb70336c60 100644

--- a/chrome/browser/prefs/pref_service_browsertest.cc

+++ b/chrome/browser/prefs/pref_service_browsertest.cc

@@ -12,6 +12,7 @@

#include "base/test/test_file_util.h"

#include "base/values.h"

#include "build/build_config.h"

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

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/common/chrome_constants.h"

@@ -37,7 +38,8 @@ class PreferenceServiceTest : public InProcessBrowserTest {

AppendASCII("window_placement").

AppendASCII("Default"),

FilePath().Append(chrome::kPreferencesFilename));

- tmp_pref_file_ = user_data_directory.AppendASCII("Default");

+ tmp_pref_file_ =

+ user_data_directory.AppendASCII(ProfileManager::kTestUserProfile);

CHECK(file_util::CreateDirectory(tmp_pref_file_));

tmp_pref_file_ = tmp_pref_file_.Append(chrome::kPreferencesFilename);

} else {