cros: Mount the existing eCryptfs vault to start migration.

chromeos/cryptohome/homedir_methods.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/cryptohome/homedir_methods.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 204 matching lines @@
 
     if (!request.create_keys.empty()) {
       CreateRequest* create = request_proto.mutable_create();
       for (size_t i = 0; i < request.create_keys.size(); ++i)
         FillKeyProtobuf(request.create_keys[i], create->add_keys());
     }
 
     if (request.force_dircrypto_if_available)
       request_proto.set_force_dircrypto_if_available(true);
 
+    if (request.to_migrate_from_ecryptfs)
+      request_proto.set_to_migrate_from_ecryptfs(true);
+
     DBusThreadManager::Get()->GetCryptohomeClient()->MountEx(
         id, auth_proto, request_proto,
         base::Bind(&HomedirMethodsImpl::OnMountExCallback,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
   void AddKeyEx(const Identification& id,
                 const Authorization& auth,
                 const KeyDefinition& new_key,
                 bool clobber_if_exists,
@@ skipping 55 matching lines @@
 
   void GetAccountDiskUsage(
       const Identification& id,
       const GetAccountDiskUsageCallback& callback) override {
     DBusThreadManager::Get()->GetCryptohomeClient()->GetAccountDiskUsage(
         id, base::Bind(&HomedirMethodsImpl::OnGetAccountDiskUsageCallback,
                        weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
   void MigrateToDircrypto(const Identification& id,
-                          const Authorization& auth,
                           const DBusResultCallback& callback) override {
-    cryptohome::AuthorizationRequest auth_proto;
-    FillAuthorizationProtobuf(auth, &auth_proto);
-
     DBusThreadManager::Get()->GetCryptohomeClient()->MigrateToDircrypto(
-        id, auth_proto,
-        base::Bind(&HomedirMethodsImpl::OnDBusResultCallback,
-                   weak_ptr_factory_.GetWeakPtr(), callback));
+        id, base::Bind(&HomedirMethodsImpl::OnDBusResultCallback,
+                       weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
  private:
   void OnGetKeyDataExCallback(const GetKeyDataCallback& callback,
                               chromeos::DBusMethodCallStatus call_status,
                               bool result,
                               const BaseReply& reply) {
     if (call_status != chromeos::DBUS_METHOD_CALL_SUCCESS) {
       callback.Run(false, MOUNT_ERROR_FATAL, std::vector<KeyDefinition>());
       return;
@@ skipping 190 matching lines @@
   }
   delete g_homedir_methods;
   g_homedir_methods = NULL;
   VLOG(1) << "HomedirMethods Shutdown completed";
 }
 
 // static
 HomedirMethods* HomedirMethods::GetInstance() { return g_homedir_methods; }
 
 }  // namespace cryptohome