Remove ScopedVector from components/sessions.

components/sessions/core/session_backend_unittest.cc

 // Copyright 2011 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 "components/sessions/core/session_backend.h"
 
 #include <stddef.h>
 #include <utility>
 
 #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())
     memcpy(command->contents(), data.data.c_str(), data.data.size());
   return command;
 }
 
 }  // namespace
 
 class SessionBackendTest : public testing::Test {
@@ skipping 26 matching lines @@
   backend->AppendCommands(std::move(commands), false);
   ASSERT_TRUE(commands.empty());
 
   // Read it back in.
   backend = NULL;
   backend = new SessionBackend(sessions::BaseSessionService::SESSION_RESTORE,
                                path_);
   backend->ReadLastSessionCommandsImpl(&commands);
 
   ASSERT_EQ(1U, commands.size());
-  AssertCommandEqualsData(data, commands[0]);
+  AssertCommandEqualsData(data, commands[0].get());
 
   commands.clear();
 
   backend = NULL;
   backend = new SessionBackend(sessions::BaseSessionService::SESSION_RESTORE,
                                path_);
   backend->ReadLastSessionCommandsImpl(&commands);
 
   ASSERT_EQ(0U, commands.size());
 
@@ skipping 22 matching lines @@
 
   for (size_t i = 0; i < arraysize(data); ++i) {
     scoped_refptr<SessionBackend> backend(
         new SessionBackend(sessions::BaseSessionService::SESSION_RESTORE,
                            path_));
     SessionCommands commands;
     if (i != 0) {
       // 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]));
     backend->AppendCommands(std::move(commands), false);
   }
 }
 
 TEST_F(SessionBackendTest, BigData) {
   struct TestData data[] = {
     { 1,  "a" },
     { 2,  "ab" },
   };
 
   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);
 
   backend = NULL;
   backend = new SessionBackend(sessions::BaseSessionService::SESSION_RESTORE,
                                path_);
 
   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());
   EXPECT_EQ('a', reinterpret_cast<char*>(commands[1]->contents())[0]);
   EXPECT_EQ('z',
             reinterpret_cast<char*>(commands[1]->contents())[big_size - 1]);
   commands.clear();
 }
 
 TEST_F(SessionBackendTest, EmptyCommand) {
   TestData empty_command;
   empty_command.command_id = 1;
   scoped_refptr<SessionBackend> backend(
       new SessionBackend(sessions::BaseSessionService::SESSION_RESTORE, path_));
   SessionCommands empty_commands;
   empty_commands.push_back(CreateCommandFromData(empty_command));
   backend->AppendCommands(std::move(empty_commands), true);
   backend->MoveCurrentSessionToLastSession();
 
   SessionCommands commands;
   backend->ReadLastSessionCommandsImpl(&commands);
   ASSERT_EQ(1U, commands.size());
-  AssertCommandEqualsData(empty_command, commands[0]);
+  AssertCommandEqualsData(empty_command, commands[0].get());
   commands.clear();
 }
 
 // Writes a command, appends another command with reset to true, then reads
 // making sure we only get back the second command.
 TEST_F(SessionBackendTest, Truncate) {
   scoped_refptr<SessionBackend> backend(
       new SessionBackend(sessions::BaseSessionService::SESSION_RESTORE, path_));
   struct TestData first_data = { 1,  "a" };
   SessionCommands commands;
   commands.push_back(CreateCommandFromData(first_data));
   backend->AppendCommands(std::move(commands), false);
 
   // Write another command, this time resetting the file when appending.
   struct TestData second_data = { 2,  "b" };
   commands.push_back(CreateCommandFromData(second_data));
   backend->AppendCommands(std::move(commands), true);
 
   // Read it back in.
   backend = NULL;
   backend = new SessionBackend(sessions::BaseSessionService::SESSION_RESTORE,
                                path_);
   backend->ReadLastSessionCommandsImpl(&commands);
 
   // 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();
 }
 
 }  // namespace sessions