Remove ScopedVector from components/sessions.

components/sessions/core/session_backend_unittest.cc

Index: components/sessions/core/session_backend_unittest.cc
diff --git a/components/sessions/core/session_backend_unittest.cc b/components/sessions/core/session_backend_unittest.cc
index 76f0950dd0b4eb52e9f3bc340c423b67ee63b51d..4e59f9cab91081650cca6c2e30efcaaaf732b4f7 100644
--- a/components/sessions/core/session_backend_unittest.cc
+++ b/components/sessions/core/session_backend_unittest.cc
@@ -10,23 +10,24 @@
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
-#include "base/stl_util.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sessions {
 namespace {
 
-typedef ScopedVector<sessions::SessionCommand> SessionCommands;
+typedef std::vector<std::unique_ptr<sessions::SessionCommand>> SessionCommands;
 
 struct TestData {
   sessions::SessionCommand::id_type command_id;
   std::string data;
 };
 
-sessions::SessionCommand* CreateCommandFromData(const TestData& data) {
-  sessions::SessionCommand* command =
-      new sessions::SessionCommand(
+std::unique_ptr<sessions::SessionCommand> CreateCommandFromData(
+    const TestData& data) {
+  std::unique_ptr<sessions::SessionCommand> command =
+      base::MakeUnique<sessions::SessionCommand>(
           data.command_id,
           static_cast<sessions::SessionCommand::size_type>(data.data.size()));
   if (!data.data.empty())
@@ -73,7 +74,7 @@ TEST_F(SessionBackendTest, SimpleReadWrite) {
   backend->ReadLastSessionCommandsImpl(&commands);
 
   ASSERT_EQ(1U, commands.size());
-  AssertCommandEqualsData(data, commands[0]);
+  AssertCommandEqualsData(data, commands[0].get());
 
   commands.clear();
 
@@ -116,10 +117,9 @@ TEST_F(SessionBackendTest, RandomData) {
       // Read previous data.
       backend->ReadLastSessionCommandsImpl(&commands);
       ASSERT_EQ(i, commands.size());
-      for (std::vector<sessions::SessionCommand*>::iterator j =
-              commands.begin(); j != commands.end(); ++j) {
-        AssertCommandEqualsData(data[j - commands.begin()], *j);
-      }
+      for (auto j = commands.begin(); j != commands.end(); ++j)
+        AssertCommandEqualsData(data[j - commands.begin()], j->get());
+
       backend->AppendCommands(std::move(commands), false);
     }
     commands.push_back(CreateCommandFromData(data[i]));
@@ -135,17 +135,17 @@ TEST_F(SessionBackendTest, BigData) {
 
   scoped_refptr<SessionBackend> backend(
       new SessionBackend(sessions::BaseSessionService::SESSION_RESTORE, path_));
-  ScopedVector<sessions::SessionCommand> commands;
+  std::vector<std::unique_ptr<sessions::SessionCommand>> commands;
 
   commands.push_back(CreateCommandFromData(data[0]));
   const sessions::SessionCommand::size_type big_size =
       SessionBackend::kFileReadBufferSize + 100;
   const sessions::SessionCommand::id_type big_id = 50;
-  sessions::SessionCommand* big_command =
-      new sessions::SessionCommand(big_id, big_size);
+  std::unique_ptr<sessions::SessionCommand> big_command =
+      base::MakeUnique<sessions::SessionCommand>(big_id, big_size);
   reinterpret_cast<char*>(big_command->contents())[0] = 'a';
   reinterpret_cast<char*>(big_command->contents())[big_size - 1] = 'z';
-  commands.push_back(big_command);
+  commands.push_back(std::move(big_command));
   commands.push_back(CreateCommandFromData(data[1]));
   backend->AppendCommands(std::move(commands), false);
 
@@ -155,8 +155,8 @@ TEST_F(SessionBackendTest, BigData) {
 
   backend->ReadLastSessionCommandsImpl(&commands);
   ASSERT_EQ(3U, commands.size());
-  AssertCommandEqualsData(data[0], commands[0]);
-  AssertCommandEqualsData(data[1], commands[2]);
+  AssertCommandEqualsData(data[0], commands[0].get());
+  AssertCommandEqualsData(data[1], commands[2].get());
 
   EXPECT_EQ(big_id, commands[1]->id());
   ASSERT_EQ(big_size, commands[1]->size());
@@ -179,7 +179,7 @@ TEST_F(SessionBackendTest, EmptyCommand) {
   SessionCommands commands;
   backend->ReadLastSessionCommandsImpl(&commands);
   ASSERT_EQ(1U, commands.size());
-  AssertCommandEqualsData(empty_command, commands[0]);
+  AssertCommandEqualsData(empty_command, commands[0].get());
   commands.clear();
 }
 
@@ -206,7 +206,7 @@ TEST_F(SessionBackendTest, Truncate) {
 
   // And make sure we get back the expected data.
   ASSERT_EQ(1U, commands.size());
-  AssertCommandEqualsData(second_data, commands[0]);
+  AssertCommandEqualsData(second_data, commands[0].get());
 
   commands.clear();
 }