Merge cryptohome::RetrievedKeyData with cryptohome::KeyDefinition

chromeos/cryptohome/mock_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/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"
 
 using ::testing::Invoke;
 using ::testing::WithArgs;
 using ::testing::_;
 
 namespace cryptohome {
 
 MockHomedirMethods::MockHomedirMethods()
@@ skipping 16 matching lines @@
       WithArgs<4>(Invoke(this, &MockHomedirMethods::DoCallback)));
   ON_CALL(*this, RemoveKeyEx(_, _, _, _)).WillByDefault(
       WithArgs<3>(Invoke(this, &MockHomedirMethods::DoCallback)));
 }
 
 void MockHomedirMethods::DoCallback(const Callback& callback) {
   callback.Run(success_, return_code_);
 }
 
 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) {
   callback.Run(
       success_, return_code_, MockAsyncMethodCaller::kFakeSanitizedUsername);
 }
 
 }  // namespace cryptohome