Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1120)

Unified Diff: content/browser/frame_host/navigation_controller_impl_unittest.cc

Issue 1440573003: Remove ScopedVector from NavigationController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: aw Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/navigation_controller_impl_unittest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_unittest.cc b/content/browser/frame_host/navigation_controller_impl_unittest.cc
index f1100395e995024650eb2dd5d018c453aed8d4e0..19db40815053bb9bd2cd5d3bb27d9512350aa863 100644
--- a/content/browser/frame_host/navigation_controller_impl_unittest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_unittest.cc
@@ -2762,7 +2762,7 @@ TEST_F(NavigationControllerTest, EnforceMaxNavigationCount) {
TEST_F(NavigationControllerTest, RestoreNavigate) {
// Create a NavigationController with a restored set of tabs.
GURL url("http://foo");
- ScopedVector<NavigationEntry> entries;
+ std::vector<scoped_ptr<NavigationEntry>> entries;
scoped_ptr<NavigationEntry> entry =
NavigationControllerImpl::CreateNavigationEntry(
url, Referrer(), ui::PAGE_TRANSITION_RELOAD, false, std::string(),
@@ -2835,7 +2835,7 @@ TEST_F(NavigationControllerTest, RestoreNavigate) {
TEST_F(NavigationControllerTest, RestoreNavigateAfterFailure) {
// Create a NavigationController with a restored set of tabs.
GURL url("http://foo");
- ScopedVector<NavigationEntry> entries;
+ std::vector<scoped_ptr<NavigationEntry>> entries;
scoped_ptr<NavigationEntry> new_entry =
NavigationControllerImpl::CreateNavigationEntry(
url, Referrer(), ui::PAGE_TRANSITION_RELOAD, false, std::string(),
@@ -4345,7 +4345,7 @@ TEST_F(NavigationControllerTest, CopyRestoredStateAndNavigate) {
};
const GURL kInitialUrl("http://site3.com");
- ScopedVector<NavigationEntry> entries;
+ std::vector<scoped_ptr<NavigationEntry>> entries;
for (size_t i = 0; i < arraysize(kRestoredUrls); ++i) {
scoped_ptr<NavigationEntry> entry =
NavigationControllerImpl::CreateNavigationEntry(

Powered by Google App Engine
This is Rietveld 408576698