chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc - Issue 23494053: Remove NOTIFICATION_SYSTEM_SETTING_CHANGED, switch CrosSettings to base::CallbackRegistry.

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/existing_user_controller_auto_login_unittest.cc

Issue 23494053: Remove NOTIFICATION_SYSTEM_SETTING_CHANGED, switch CrosSettings to base::CallbackRegistry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: trailing space Created 7 years, 3 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/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/existing_user_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 128f1b835c37788a98df58517c70081d10bcaef3..68e267cc6c887a4ae897d99cc73ff68bf6bb4821 100644

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

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

@@ -87,12 +87,10 @@ class ExistingUserControllerAutoLoginTest : public ::testing::Test {

CrosSettings::Get()->Set(kAccountsPrefDeviceLocalAccounts, accounts);

// Prevent settings changes from auto-starting the timer.

- CrosSettings::Get()->RemoveSettingsObserver(

- kAccountsPrefDeviceLocalAccountAutoLoginId,

- existing_user_controller());

- CrosSettings::Get()->RemoveSettingsObserver(

- kAccountsPrefDeviceLocalAccountAutoLoginDelay,

- existing_user_controller());

+ existing_user_controller_->

+ local_account_auto_login_id_subscription_.reset();

+ existing_user_controller_->

+ local_account_auto_login_delay_subscription_.reset();

}

const ExistingUserController* existing_user_controller() const {