chrome/browser/chromeos/login/login_utils_browsertest.cc - Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

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/chromeos/login/login_utils_browsertest.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix double registration in Chrome Frame test. Created 7 years, 10 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

Index: chrome/browser/chromeos/login/login_utils_browsertest.cc

diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc

index 46dece0289289e332f950d7e19545d081b109f73..f1139ea7ef7908cc834802f658febce2648d0b32 100644

--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc

+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc

@@ -28,6 +28,7 @@

#include "chrome/browser/policy/enterprise_install_attributes.h"

#include "chrome/browser/policy/policy_service.h"

#include "chrome/browser/policy/proto/device_management_backend.pb.h"

+#include "chrome/browser/prefs/pref_registry_simple.h"

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

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

#include "chrome/common/chrome_notification_types.h"

@@ -187,8 +188,6 @@ class LoginUtilsTest : public testing::Test,

// OAuth2 path.

command_line->AppendSwitch(switches::kForceOAuth1);

- local_state_.Get()->RegisterStringPref(prefs::kApplicationLocale, "");

// DBusThreadManager should be initialized before io_thread_state_, as

// DBusThreadManager is used from chromeos::ProxyConfigServiceImpl,

// which is part of io_thread_state_.

« no previous file with comments | « chrome/browser/chromeos/language_preferences.cc ('k') | chrome/browser/chromeos/login/user_image_manager.h » ('j') | no next file with comments »