Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(315)

Unified Diff: chromeos/dbus/fake_cryptohome_client.cc

Issue 2818393002: cros: Mount the existing eCryptfs vault to start migration. (Closed)
Patch Set: Fix a comment. 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/fake_cryptohome_client.h ('k') | chromeos/dbus/mock_cryptohome_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..d3bae2d45ca1849141285214ee2fa0634b845fd5 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);
@@ -592,7 +593,6 @@ void FakeCryptohomeClient::FlushAndSignBootAttributes(
void FakeCryptohomeClient::MigrateToDircrypto(
const cryptohome::Identification& cryptohome_id,
- const cryptohome::AuthorizationRequest& auth,
const VoidDBusMethodCallback& callback) {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
« no previous file with comments | « chromeos/dbus/fake_cryptohome_client.h ('k') | chromeos/dbus/mock_cryptohome_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698