chromeos/dbus/fake_cryptohome_client.cc - Issue 2818393002: cros: Mount the existing eCryptfs vault to start migration.

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: chromeos/dbus/fake_cryptohome_client.cc

Issue 2818393002: cros: Mount the existing eCryptfs vault to start migration. (Closed)

Patch Set: FakeCryptohomeClient::MountEx should succeed when |to_migrate_from_ecryptfs| is true. Created 3 years, 8 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:

Index: chromeos/dbus/fake_cryptohome_client.cc

diff --git a/chromeos/dbus/fake_cryptohome_client.cc b/chromeos/dbus/fake_cryptohome_client.cc

index 1410ec538be6d0a2a3219762563e98ed0071ba03..3d87897c14ed4fa974c504b7abb3a65b147c5d33 100644

--- a/chromeos/dbus/fake_cryptohome_client.cc

+++ b/chromeos/dbus/fake_cryptohome_client.cc

@@ -533,7 +533,8 @@ void FakeCryptohomeClient::MountEx(

reply.MutableExtension(cryptohome::MountReply::reply);

mount->set_sanitized_username(GetStubSanitizedUsername(cryptohome_id));

if (base::CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kTestEncryptionMigrationUI)) {

+ switches::kTestEncryptionMigrationUI) &&

+ !request.to_migrate_from_ecryptfs()) {

reply.set_error(cryptohome::CRYPTOHOME_ERROR_MOUNT_OLD_ENCRYPTION);

}

ReturnProtobufMethodCallback(reply, callback);