Remove ScopedVector from components/sessions.

ios/web/navigation/crw_session_controller_unittest.mm

 // Copyright 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.
 
 #import "ios/web/navigation/crw_session_controller.h"
 
 #import <Foundation/Foundation.h>
 
 #include <utility>
 
 #include "base/logging.h"
 #import "base/mac/scoped_nsobject.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #import "ios/web/navigation/crw_session_controller+private_constructors.h"
 #import "ios/web/navigation/crw_session_entry.h"
 #import "ios/web/navigation/navigation_item_impl.h"
 #include "ios/web/public/referrer.h"
 #include "ios/web/public/test/test_browser_state.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
 #import "net/base/mac/url_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
@@ skipping 643 matching lines @@
 // Tests state of an empty session controller.
 TEST_F(CRWSessionControllerTest, EmptyController) {
   EXPECT_EQ(0U, [[session_controller_ entries] count]);
   EXPECT_EQ(-1, [session_controller_ currentNavigationIndex]);
   EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
   EXPECT_FALSE([session_controller_ currentEntry]);
   EXPECT_FALSE([session_controller_ pendingEntry]);
   EXPECT_EQ(-1, [session_controller_ pendingEntryIndex]);
 }
 
-// Helper to create a NavigationItem. Caller is responsible for freeing
-// the memory.
-web::NavigationItem* CreateNavigationItem(const std::string& url,
-                                          const std::string& referrer,
-                                          NSString* title) {
+// Helper to create a NavigationItem.
+std::unique_ptr<web::NavigationItemImpl> CreateNavigationItem(
+    const std::string& url,
+    const std::string& referrer,
+    NSString* title) {
   web::Referrer referrer_object(GURL(referrer),
                                 web::ReferrerPolicyDefault);
-  web::NavigationItemImpl* navigation_item = new web::NavigationItemImpl();
+  std::unique_ptr<web::NavigationItemImpl> navigation_item =
+      base::MakeUnique<web::NavigationItemImpl>();
   navigation_item->SetURL(GURL(url));
   navigation_item->SetReferrer(referrer_object);
   navigation_item->SetTitle(base::SysNSStringToUTF16(title));
   navigation_item->SetTransitionType(ui::PAGE_TRANSITION_TYPED);
 
   return navigation_item;
 }
 
 TEST_F(CRWSessionControllerTest, CreateWithEmptyNavigations) {
-  ScopedVector<web::NavigationItem> items;
+  std::vector<std::unique_ptr<web::NavigationItem>> items;
   base::scoped_nsobject<CRWSessionController> controller(
       [[CRWSessionController alloc] initWithNavigationItems:std::move(items)
                                                currentIndex:0
                                                browserState:&browser_state_]);
   EXPECT_EQ(controller.get().entries.count, 0U);
   EXPECT_EQ(controller.get().currentNavigationIndex, -1);
   EXPECT_EQ(controller.get().previousNavigationIndex, -1);
   EXPECT_FALSE(controller.get().currentEntry);
 }
 
 TEST_F(CRWSessionControllerTest, CreateWithNavList) {
-  ScopedVector<web::NavigationItem> items;
+  std::vector<std::unique_ptr<web::NavigationItem>> items;
   items.push_back(CreateNavigationItem("http://www.google.com",
                                        "http://www.referrer.com", @"Google"));
   items.push_back(CreateNavigationItem("http://www.yahoo.com",
                                        "http://www.google.com", @"Yahoo"));
   items.push_back(CreateNavigationItem("http://www.espn.com",
                                        "http://www.nothing.com", @"ESPN"));
   base::scoped_nsobject<CRWSessionController> controller(
       [[CRWSessionController alloc] initWithNavigationItems:std::move(items)
                                                currentIndex:1
                                                browserState:&browser_state_]);
@@ skipping 42 matching lines @@
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, 1);
 
   [session_controller_ goToEntryAtIndex:1];
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, 0);
 
   [session_controller_ goToEntryAtIndex:2];
   EXPECT_EQ(session_controller_.get().previousNavigationIndex, 1);
 }
 
 TEST_F(CRWSessionControllerTest, PushNewEntry) {
-  ScopedVector<web::NavigationItem> items;
+  std::vector<std::unique_ptr<web::NavigationItem>> items;
   items.push_back(CreateNavigationItem("http://www.firstpage.com",
                                        "http://www.starturl.com", @"First"));
   items.push_back(CreateNavigationItem("http://www.secondpage.com",
                                        "http://www.firstpage.com", @"Second"));
   items.push_back(CreateNavigationItem("http://www.thirdpage.com",
                                        "http://www.secondpage.com", @"Third"));
   base::scoped_nsobject<CRWSessionController> controller(
       [[CRWSessionController alloc] initWithNavigationItems:std::move(items)
                                                currentIndex:0
                                                browserState:&browser_state_]);
@@ skipping 22 matching lines @@
   pushedItem = pushedEntry.navigationItemImpl;
   expectedCount = 3;
   EXPECT_EQ(expectedCount, controller.get().entries.count);
   EXPECT_EQ(pushPageGurl2, pushedEntry.navigationItem->GetURL());
   EXPECT_TRUE(pushedItem->IsCreatedFromPushState());
   EXPECT_EQ(nil, pushedItem->GetSerializedStateObject());
   EXPECT_EQ(pushPageGurl1, pushedEntry.navigationItem->GetReferrer().url);
 }
 
 TEST_F(CRWSessionControllerTest, IsSameDocumentNavigation) {
-  ScopedVector<web::NavigationItem> items;
+  std::vector<std::unique_ptr<web::NavigationItem>> items;
   items.push_back(
       CreateNavigationItem("http://foo.com", "http://google.com", @"First"));
   // Push state navigation.
   items.push_back(
       CreateNavigationItem("http://foo.com#bar", "http://foo.com", @"Second"));
   items.push_back(CreateNavigationItem("http://google.com",
                                        "http://foo.com#bar", @"Third"));
   items.push_back(
       CreateNavigationItem("http://foo.com", "http://google.com", @"Fourth"));
   // Push state navigation.
@@ skipping 26 matching lines @@
       [controller isSameDocumentNavigationBetweenEntry:entry4 andEntry:entry3]);
   EXPECT_FALSE(
       [controller isSameDocumentNavigationBetweenEntry:entry1 andEntry:entry2]);
   EXPECT_FALSE(
       [controller isSameDocumentNavigationBetweenEntry:entry0 andEntry:entry5]);
   EXPECT_FALSE(
       [controller isSameDocumentNavigationBetweenEntry:entry2 andEntry:entry4]);
 }
 
 TEST_F(CRWSessionControllerTest, UpdateCurrentEntry) {
-  ScopedVector<web::NavigationItem> items;
+  std::vector<std::unique_ptr<web::NavigationItem>> items;
   items.push_back(CreateNavigationItem("http://www.firstpage.com",
                                        "http://www.starturl.com", @"First"));
   items.push_back(CreateNavigationItem("http://www.secondpage.com",
                                        "http://www.firstpage.com", @"Second"));
   items.push_back(CreateNavigationItem("http://www.thirdpage.com",
                                        "http://www.secondpage.com", @"Third"));
   base::scoped_nsobject<CRWSessionController> controller(
       [[CRWSessionController alloc] initWithNavigationItems:std::move(items)
                                                currentIndex:0
                                                browserState:&browser_state_]);
@@ skipping 251 matching lines @@
   [session_controller_ commitPendingEntry];
   [session_controller_ addPendingEntry:GURL("http://www.example.com/0")
                               referrer:MakeReferrer("http://www.example.com/b")
                             transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
                      rendererInitiated:YES];
   [session_controller_ commitPendingEntry];
   EXPECT_EQ(0U, [session_controller_ backwardEntries].count);
 }
 
 }  // anonymous namespace