Remove Scopevector in //components/sync/

components/sync/test/engine/mock_connection_manager.h

 // Copyright (c) 2012 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 COMPONENTS_SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 #define COMPONENTS_SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_
 
 #include <stdint.h>
 
 #include <bitset>
 #include <list>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
 #include "base/synchronization/lock.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/unique_position.h"
 #include "components/sync/engine_impl/net/server_connection_manager.h"
 #include "components/sync/protocol/sync.pb.h"
 
 namespace syncer {
 
 namespace syncable {
 class Directory;
@@ skipping 150 matching lines @@
 
   // warning: These take ownership of their input.
   void SetGUClientCommand(sync_pb::ClientCommand* command);
   void SetCommitClientCommand(sync_pb::ClientCommand* command);
 
   void SetTransientErrorId(syncable::Id);
 
   const std::vector<syncable::Id>& committed_ids() const {
     return committed_ids_;
   }
-  const std::vector<sync_pb::CommitMessage*>& commit_messages() const {
-    return commit_messages_.get();
+  const std::vector<std::unique_ptr<sync_pb::CommitMessage>>& commit_messages()
+      const {
+    return commit_messages_;
   }
-  const std::vector<sync_pb::CommitResponse*>& commit_responses() const {
-    return commit_responses_.get();
+  const std::vector<std::unique_ptr<sync_pb::CommitResponse>>&
+  commit_responses() const {
+    return commit_responses_;
   }
   // Retrieve the last sent commit message.
   const sync_pb::CommitMessage& last_sent_commit() const;
 
   // Retrieve the last returned commit response.
   const sync_pb::CommitResponse& last_commit_response() const;
 
   // Retrieve the last request submitted to the server (regardless of type).
   const sync_pb::ClientToServerMessage& last_request() const;
 
@@ skipping 134 matching lines @@
   std::vector<syncable::Id> committed_ids_;
 
   // List of IDs which should return a transient error.
   std::vector<syncable::Id> transient_error_ids_;
 
   // Control of when/if we return conflicts.
   bool conflict_all_commits_;
   int conflict_n_commits_;
 
   // Commit messages we've sent, and responses we've returned.
-  ScopedVector<sync_pb::CommitMessage> commit_messages_;
-  ScopedVector<sync_pb::CommitResponse> commit_responses_;
+  std::vector<std::unique_ptr<sync_pb::CommitMessage>> commit_messages_;
+  std::vector<std::unique_ptr<sync_pb::CommitResponse>> commit_responses_;
 
   // The next id the mock will return to a commit.
   int next_new_id_;
 
   // The store birthday we send to the client.
   std::string store_birthday_;
   base::Lock store_birthday_lock_;
   bool store_birthday_sent_;
   bool client_stuck_;
   std::string commit_time_rename_prepended_string_;
@@ skipping 54 matching lines @@
   std::string next_token_;
 
   std::vector<sync_pb::ClientToServerMessage> requests_;
 
   DISALLOW_COPY_AND_ASSIGN(MockConnectionManager);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_TEST_ENGINE_MOCK_CONNECTION_MANAGER_H_