Merge cryptohome::RetrievedKeyData with cryptohome::KeyDefinition

chromeos/cryptohome/homedir_methods.h

 // 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.
 
 #ifndef CHROMEOS_CRYPTOHOME_HOMEDIR_METHODS_H_
 #define CHROMEOS_CRYPTOHOME_HOMEDIR_METHODS_H_
 
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
-#include "base/memory/scoped_vector.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace cryptohome {
 
 // This class manages calls to Cryptohome service's home directory methods:
 // Mount, CheckKey, Add/UpdateKey.
 class CHROMEOS_EXPORT HomedirMethods {
  public:
   // Callbacks that are called back on the UI thread when the results of the
   // respective method calls are ready.
   typedef base::Callback<void(bool success, MountError return_code)> Callback;
   typedef base::Callback<void(
       bool success,
       MountError return_code,
-      ScopedVector<RetrievedKeyData> key_data)> GetKeyDataCallback;
+      const std::vector<KeyDefinition>& key_definitions)> GetKeyDataCallback;
   typedef base::Callback<
       void(bool success, MountError return_code, const std::string& mount_hash)>
       MountCallback;
 
   virtual ~HomedirMethods() {}
 
   // Asks cryptohomed to return data about the key identified by |label| for the
   // user identified by |id|. At present, this does not return any secret
   // information and the request does not need to be authenticated.
   virtual void GetKeyDataEx(const Identification& id,
@@ skipping 62 matching lines @@
   static void Shutdown();
 
   // Returns a pointer to the global HomedirMethods instance.
   // Initialize() should already have been called.
   static HomedirMethods* GetInstance();
 };
 
 }  // namespace cryptohome
 
 #endif  // CHROMEOS_CRYPTOHOME_HOMEDIR_METHODS_H_