Merge cryptohome::RetrievedKeyData with cryptohome::KeyDefinition

chromeos/cryptohome/mock_homedir_methods.cc

Index: chromeos/cryptohome/mock_homedir_methods.cc
diff --git a/chromeos/cryptohome/mock_homedir_methods.cc b/chromeos/cryptohome/mock_homedir_methods.cc
index db6edb5f81134bb0b0f13583581a2f7346190ad3..dfc506f99028a86ba36022ae09f4ab51536dabb3 100644
--- a/chromeos/cryptohome/mock_homedir_methods.cc
+++ b/chromeos/cryptohome/mock_homedir_methods.cc
@@ -4,7 +4,8 @@
 
 #include "chromeos/cryptohome/mock_homedir_methods.h"
 
-#include "base/memory/scoped_vector.h"
+#include <vector>
+
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/cryptohome/mock_async_method_caller.h"
 
@@ -41,7 +42,7 @@ void MockHomedirMethods::DoCallback(const Callback& callback) {
 }
 
 void MockHomedirMethods::DoGetDataCallback(const GetKeyDataCallback& callback) {
-  callback.Run(success_, return_code_, ScopedVector<RetrievedKeyData>());
+  callback.Run(success_, return_code_, std::vector<KeyDefinition>());
 }
 
 void MockHomedirMethods::DoMountCallback(const MountCallback& callback) {