chromeos/dbus/mock_cryptohome_client.h - Issue 1165323004: We should use UserID object to identify users instead of username.

Unified Diff: chromeos/dbus/mock_cryptohome_client.h

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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

« chrome/browser/profiles/profile_window.cc ('K') | « chromeos/dbus/fake_session_manager_client.cc ('k') | chromeos/dbus/mock_session_manager_client.h » ('j') | components/user_manager/user_id.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/dbus/mock_cryptohome_client.h

diff --git a/chromeos/dbus/mock_cryptohome_client.h b/chromeos/dbus/mock_cryptohome_client.h

index 20ccbb520aac314ea409ca294651b073f4ddb41c..52f52c7190a15b1ce3194dde295c3ba33a895fe4 100644

--- a/chromeos/dbus/mock_cryptohome_client.h

+++ b/chromeos/dbus/mock_cryptohome_client.h

@@ -9,6 +9,7 @@

#include "chromeos/dbus/cryptohome/rpc.pb.h"

#include "chromeos/dbus/cryptohome_client.h"

+#include "components/user_manager/user_id.h"

#include "testing/gmock/include/gmock/gmock.h"

namespace chromeos {

@@ -28,27 +29,27 @@ class MockCryptohomeClient : public CryptohomeClient {

MOCK_METHOD1(IsMounted, void(const BoolDBusMethodCallback& callback));

MOCK_METHOD1(Unmount, bool(bool* success));

MOCK_METHOD3(AsyncCheckKey,

- void(const std::string& username,

+ void(const user_manager::UserID& user_id,

const std::string& key,

const AsyncMethodCallback& callback));

MOCK_METHOD4(AsyncMigrateKey,

- void(const std::string& username,

+ void(const user_manager::UserID& user_id,

const std::string& from_key,

const std::string& to_key,

const AsyncMethodCallback& callback));

- MOCK_METHOD2(AsyncRemove, void(const std::string& username,

+ MOCK_METHOD2(AsyncRemove, void(const user_manager::UserID& user_id,

const AsyncMethodCallback& callback));

MOCK_METHOD1(GetSystemSalt, void(const GetSystemSaltCallback& callback));

MOCK_METHOD2(GetSanitizedUsername,

- void(const std::string& username,

+ void(const user_manager::UserID& user_id,

const StringDBusMethodCallback& callback));

MOCK_METHOD1(BlockingGetSanitizedUsername,

- std::string(const std::string& username));

- MOCK_METHOD4(AsyncMount, void(const std::string& username,

+ std::string(const user_manager::UserID& user_id));

+ MOCK_METHOD4(AsyncMount, void(const user_manager::UserID& user_id,

const std::string& key,

int flags,

const AsyncMethodCallback& callback));

- MOCK_METHOD4(AsyncAddKey, void(const std::string& username,

+ MOCK_METHOD4(AsyncAddKey, void(const user_manager::UserID& user_id,

const std::string& key,

const std::string& new_key,

const AsyncMethodCallback& callback));

@@ -75,7 +76,7 @@ class MockCryptohomeClient : public CryptohomeClient {

MOCK_METHOD1(Pkcs11GetTpmTokenInfo,

void(const Pkcs11GetTpmTokenInfoCallback& callback));

MOCK_METHOD2(Pkcs11GetTpmTokenInfoForUser,

- void(const std::string& username,

+ void(const user_manager::UserID& user_id,

const Pkcs11GetTpmTokenInfoCallback& callback));

MOCK_METHOD3(InstallAttributesGet,

bool(const std::string& name,

@@ -105,38 +106,38 @@ class MockCryptohomeClient : public CryptohomeClient {

AsyncTpmAttestationCreateCertRequest,

void(attestation::PrivacyCAType pca_type,

attestation::AttestationCertificateProfile certificate_profile,

- const std::string& user_id,

+ const user_manager::UserID& user_id,

const std::string& request_origin,

const AsyncMethodCallback& callback));

MOCK_METHOD5(AsyncTpmAttestationFinishCertRequest,

void(const std::string& pca_response,

attestation::AttestationKeyType key_type,

- const std::string& user_id,

+ const user_manager::UserID& user_id,

const std::string& key_name,

const AsyncMethodCallback& callback));

MOCK_METHOD4(TpmAttestationDoesKeyExist,

void(attestation::AttestationKeyType key_type,

- const std::string& user_id,

+ const user_manager::UserID& user_id,

const std::string& key_name,

const BoolDBusMethodCallback& callback));

MOCK_METHOD4(TpmAttestationGetCertificate,

void(attestation::AttestationKeyType key_type,

- const std::string& user_id,

+ const user_manager::UserID& user_id,

const std::string& key_name,

const DataMethodCallback& callback));

MOCK_METHOD4(TpmAttestationGetPublicKey,

void(attestation::AttestationKeyType key_type,

- const std::string& user_id,

+ const user_manager::UserID& user_id,

const std::string& key_name,

const DataMethodCallback& callback));

MOCK_METHOD4(TpmAttestationRegisterKey,

void(attestation::AttestationKeyType key_type,

- const std::string& user_id,

+ const user_manager::UserID& user_id,

const std::string& key_name,

const AsyncMethodCallback& callback));

MOCK_METHOD8(TpmAttestationSignEnterpriseChallenge,

void(attestation::AttestationKeyType key_type,

- const std::string& user_id,

+ const user_manager::UserID& user_id,

const std::string& key_name,

const std::string& domain,

const std::string& device_id,

@@ -145,24 +146,24 @@ class MockCryptohomeClient : public CryptohomeClient {

const AsyncMethodCallback& callback));

MOCK_METHOD5(TpmAttestationSignSimpleChallenge,

void(attestation::AttestationKeyType key_type,

- const std::string& user_id,

+ const user_manager::UserID& user_id,

const std::string& key_name,

const std::string& challenge,

const AsyncMethodCallback& callback));

MOCK_METHOD4(TpmAttestationGetKeyPayload,

void(attestation::AttestationKeyType key_type,

- const std::string& user_id,

+ const user_manager::UserID& user_id,

const std::string& key_name,

const DataMethodCallback& callback));

MOCK_METHOD5(TpmAttestationSetKeyPayload,

void(attestation::AttestationKeyType key_type,

- const std::string& user_id,

+ const user_manager::UserID& user_id,

const std::string& key_name,

const std::string& payload,

const BoolDBusMethodCallback& callback));

MOCK_METHOD4(TpmAttestationDeleteKeys,

void(attestation::AttestationKeyType key_type,

- const std::string& user_id,

+ const user_manager::UserID& user_id,

const std::string& key_prefix,

const BoolDBusMethodCallback& callback));

MOCK_METHOD4(GetKeyDataEx,