chrome/browser/browsing_data/browsing_data_remover_unittest.cc - Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId.

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/browsing_data/browsing_data_remover_unittest.cc

Issue 1425093004: Revert of This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names

Patch Set: Created 5 years, 2 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 | « ash/test/test_session_state_delegate.cc ('k') | chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/browsing_data/browsing_data_remover_unittest.cc

diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc

index cbaaa50d1687b945cb4131bbfd6ec441a3a0a1ee..a7a47d13de2d28cd6072794e186af78e59405957 100644

--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc

+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc

@@ -72,7 +72,6 @@

#include "chrome/browser/chromeos/settings/device_settings_service.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/mock_cryptohome_client.h"

-#include "components/signin/core/account_id/account_id.h"

#endif

#if defined(ENABLE_EXTENSIONS)

@@ -2019,8 +2018,7 @@

chromeos::ScopedTestCrosSettings test_cros_settings;

chromeos::MockUserManager* mock_user_manager =

new testing::NiceMock<chromeos::MockUserManager>();

- mock_user_manager->SetActiveUser(

- AccountId::FromUserEmail("test@example.com"));

+ mock_user_manager->SetActiveUser("test@example.com");

chromeos::ScopedUserManagerEnabler user_manager_enabler(mock_user_manager);

scoped_ptr<chromeos::DBusThreadManagerSetter> dbus_setter =