chrome/browser/chromeos/settings/device_settings_test_helper.h - Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier.

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/settings/device_settings_test_helper.h

Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed unit tests. Created 4 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

« no previous file with comments | « chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc ('k') | chrome/browser/chromeos/settings/device_settings_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/device_settings_test_helper.h

diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h

index cb36b6a2eaf58473d0b323f0eaea0e8a98cca23e..5bf73f3c8c5e39825b5fc2a56ea22568d6b41edc 100644

--- a/chrome/browser/chromeos/settings/device_settings_test_helper.h

+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h

@@ -89,7 +89,7 @@ class DeviceSettingsTestHelper : public SessionManagerClient {

bool IsScreenLocked() const override;

void EmitLoginPromptVisible() override;

void RestartJob(const std::vector<std::string>& argv) override;

- void StartSession(const std::string& user_email) override;

+ void StartSession(const cryptohome::Identification& cryptohome_id) override;

void StopSession() override;

void NotifySupervisedUserCreationStarted() override;

void NotifySupervisedUserCreationFinished() override;

@@ -99,23 +99,23 @@ class DeviceSettingsTestHelper : public SessionManagerClient {

void NotifyLockScreenDismissed() override;

void RetrieveActiveSessions(const ActiveSessionsCallback& callback) override;

void RetrieveDevicePolicy(const RetrievePolicyCallback& callback) override;

- void RetrievePolicyForUser(const std::string& username,

+ void RetrievePolicyForUser(const cryptohome::Identification& cryptohome_id,

const RetrievePolicyCallback& callback) override;

std::string BlockingRetrievePolicyForUser(

- const std::string& username) override;

+ const cryptohome::Identification& cryptohome_id) override;

void RetrieveDeviceLocalAccountPolicy(

const std::string& account_id,

const RetrievePolicyCallback& callback) override;

void StoreDevicePolicy(const std::string& policy_blob,

const StorePolicyCallback& callback) override;

- void StorePolicyForUser(const std::string& username,

+ void StorePolicyForUser(const cryptohome::Identification& cryptohome_id,

const std::string& policy_blob,

const StorePolicyCallback& callback) override;

void StoreDeviceLocalAccountPolicy(

const std::string& account_id,

const std::string& policy_blob,

const StorePolicyCallback& callback) override;

- void SetFlagsForUser(const std::string& account_id,

+ void SetFlagsForUser(const cryptohome::Identification& cryptohome_id,

const std::vector<std::string>& flags) override;

void GetServerBackedStateKeys(const StateKeysCallback& callback) override;