chrome/browser/chromeos/login/users/mock_user_manager.h - Issue 1262883003: Revert of Added affiliation IDs for the new affiliation determination.

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/users/mock_user_manager.h

Issue 1262883003: Revert of Added affiliation IDs for the new affiliation determination. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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/users/chrome_user_manager_impl.cc ('k') | chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/mock_user_manager.h

diff --git a/chrome/browser/chromeos/login/users/mock_user_manager.h b/chrome/browser/chromeos/login/users/mock_user_manager.h

index 2b4af299dff2acef87ff84e327a67d5b08e20509..c7545bc6b6e7dcfbf8a7c085e3fb82fc20e23868 100644

--- a/chrome/browser/chromeos/login/users/mock_user_manager.h

+++ b/chrome/browser/chromeos/login/users/mock_user_manager.h

@@ -10,7 +10,6 @@

#include "base/files/file_path.h"

#include "base/memory/weak_ptr.h"

#include "chrome/browser/chromeos/login/user_flow.h"

-#include "chrome/browser/chromeos/login/users/affiliation.h"

#include "chrome/browser/chromeos/login/users/avatar/mock_user_image_manager.h"

#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"

#include "components/user_manager/user.h"

@@ -96,9 +95,6 @@

MOCK_METHOD1(KioskAppLoggedIn, void(const std::string&));

MOCK_METHOD1(PublicAccountUserLoggedIn, void(user_manager::User*));

MOCK_METHOD1(SupervisedUserLoggedIn, void(const std::string&));

- MOCK_METHOD2(SetUserAffiliation,

- void(const std::string& user_id,

- const chromeos::AffiliationIDSet& user_affiliation_ids));

// You can't mock these functions easily because nobody can create

// User objects but the ChromeUserManager and us.