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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ios/web/navigation/crw_session_controller_unittest.mm

Issue 2690913003: Revert "Updated ownership of NavigationItems within CRWSessionController." (Closed)
Patch Set: Revert olivier's CLs Created 3 years, 10 months 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
« no previous file with comments | « ios/web/navigation/crw_session_controller.mm ('k') | ios/web/navigation/crw_session_entry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/navigation/crw_session_controller_unittest.mm
diff --git a/ios/web/navigation/crw_session_controller_unittest.mm b/ios/web/navigation/crw_session_controller_unittest.mm
index ad09509c2ce9b38e90590da1049abe12a0c3ea32..40b2c18c8896dd6b4ff8b8883cc8c9aef5561da5 100644
--- a/ios/web/navigation/crw_session_controller_unittest.mm
+++ b/ios/web/navigation/crw_session_controller_unittest.mm
@@ -13,6 +13,7 @@
#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/fakes/test_browser_state.h"
@@ -23,20 +24,20 @@
#include "testing/platform_test.h"
@interface CRWSessionController (Testing)
-- (GURL)URLForNavigationItemAtIndex:(size_t)index;
-- (GURL)currentURL;
+- (const GURL&)URLForSessionAtIndex:(NSUInteger)index;
+- (const GURL&)currentURL;
@end
@implementation CRWSessionController (Testing)
-- (GURL)URLForNavigationItemAtIndex:(size_t)index {
- if (index < self.items.size())
- return self.items[index]->GetURL();
- return GURL();
+- (const GURL&)URLForSessionAtIndex:(NSUInteger)index {
+ CRWSessionEntry* entry =
+ static_cast<CRWSessionEntry*>([self.entries objectAtIndex:index]);
+ return entry.navigationItem->GetURL();
}
-- (GURL)currentURL {
- web::NavigationItem* currentItem = self.currentItem;
- return currentItem ? currentItem->GetURL() : GURL();
+- (const GURL&)currentURL {
+ DCHECK([self currentEntry]);
+ return [self currentEntry].navigationItem->GetURL();
}
@end
@@ -66,8 +67,8 @@ void SetUp() override {
EXPECT_NSEQ(@"test window", [session_controller_ windowName]);
EXPECT_NSEQ(@"opener", [session_controller_ openerId]);
EXPECT_FALSE([session_controller_ isOpenedByDOM]);
- EXPECT_EQ(0U, [session_controller_ items].size());
- EXPECT_EQ(nullptr, [session_controller_ currentItem]);
+ EXPECT_EQ(0U, [[session_controller_ entries] count]);
+ EXPECT_EQ(nil, [session_controller_ currentEntry]);
}
// Tests session controller state after setting a pending index.
@@ -81,8 +82,8 @@ void SetUp() override {
EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
[session_controller_ setPendingItemIndex:0];
EXPECT_EQ(0, [session_controller_ pendingItemIndex]);
- EXPECT_EQ([session_controller_ items].back().get(),
- [session_controller_ pendingItem]);
+ EXPECT_EQ([[session_controller_ entries] lastObject],
+ [session_controller_ pendingEntry]);
}
TEST_F(CRWSessionControllerTest, addPendingItem) {
@@ -91,13 +92,13 @@ void SetUp() override {
transition:ui::PAGE_TRANSITION_TYPED
rendererInitiated:NO];
- EXPECT_EQ(0U, [session_controller_ items].size());
+ EXPECT_EQ(0U, [[session_controller_ entries] count]);
EXPECT_EQ(
GURL("http://www.url.com/"),
[session_controller_ currentURL]);
}
-TEST_F(CRWSessionControllerTest, addPendingItemWithCommittedItems) {
+TEST_F(CRWSessionControllerTest, addPendingItemWithCommittedEntries) {
[session_controller_ addPendingItem:GURL("http://www.committed.url.com")
referrer:MakeReferrer("http://www.referer.com")
transition:ui::PAGE_TRANSITION_TYPED
@@ -109,16 +110,17 @@ void SetUp() override {
transition:ui::PAGE_TRANSITION_TYPED
rendererInitiated:NO];
- EXPECT_EQ(1U, [session_controller_ items].size());
- EXPECT_EQ(GURL("http://www.committed.url.com/"),
- [session_controller_ URLForNavigationItemAtIndex:0U]);
+ EXPECT_EQ(1U, [[session_controller_ entries] count]);
+ EXPECT_EQ(
+ GURL("http://www.committed.url.com/"),
+ [session_controller_ URLForSessionAtIndex:0U]);
EXPECT_EQ(
GURL("http://www.url.com/"),
[session_controller_ currentURL]);
}
-// Tests that adding a pending item resets pending item index.
-TEST_F(CRWSessionControllerTest, addPendingItemWithExisingPendingItemIndex) {
+// Tests that adding a pending entry resets pending entry index.
+TEST_F(CRWSessionControllerTest, addPendingItemWithExisingPendingEntryIndex) {
[session_controller_ addPendingItem:GURL("http://www.example.com")
referrer:web::Referrer()
transition:ui::PAGE_TRANSITION_TYPED
@@ -130,19 +132,19 @@ void SetUp() override {
rendererInitiated:NO];
[session_controller_ commitPendingItem];
- // Set 0 as pending item index.
+ // Set 0 as pending entry index.
[session_controller_ setPendingItemIndex:0];
EXPECT_EQ(GURL("http://www.example.com/"),
- [session_controller_ pendingItem]->GetURL());
+ [[session_controller_ pendingEntry] navigationItem]->GetURL());
EXPECT_EQ(0, [session_controller_ pendingItemIndex]);
- // Add a pending item, which should drop pending navigation index.
+ // Add a pending entry, which should drop pending navigation index.
[session_controller_ addPendingItem:GURL("http://www.example.com/1")
referrer:web::Referrer()
transition:ui::PAGE_TRANSITION_TYPED
rendererInitiated:NO];
EXPECT_EQ(GURL("http://www.example.com/1"),
- [session_controller_ pendingItem]->GetURL());
+ [[session_controller_ pendingEntry] navigationItem]->GetURL());
EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
}
@@ -157,7 +159,7 @@ void SetUp() override {
transition:ui::PAGE_TRANSITION_TYPED
rendererInitiated:NO];
- EXPECT_EQ(0U, [session_controller_ items].size());
+ EXPECT_EQ(0U, [[session_controller_ entries] count]);
EXPECT_EQ(
GURL("http://www.another.url.com/"),
[session_controller_ currentURL]);
@@ -170,11 +172,13 @@ void SetUp() override {
rendererInitiated:NO];
[session_controller_ commitPendingItem];
- EXPECT_EQ(1U, [session_controller_ items].size());
- EXPECT_EQ(GURL("http://www.url.com/"),
- [session_controller_ URLForNavigationItemAtIndex:0U]);
- EXPECT_EQ([session_controller_ items].front().get(),
- [session_controller_ currentItem]);
+ EXPECT_EQ(1U, [[session_controller_ entries] count]);
+ EXPECT_EQ(
+ GURL("http://www.url.com/"),
+ [session_controller_ URLForSessionAtIndex:0U]);
+ EXPECT_EQ(
+ [[session_controller_ entries] objectAtIndex:0U],
+ [session_controller_ currentEntry]);
}
TEST_F(CRWSessionControllerTest, addPendingItemOverridingAndCommit) {
@@ -189,11 +193,13 @@ void SetUp() override {
rendererInitiated:NO];
[session_controller_ commitPendingItem];
- EXPECT_EQ(1U, [session_controller_ items].size());
- EXPECT_EQ(GURL("http://www.another.url.com/"),
- [session_controller_ URLForNavigationItemAtIndex:0U]);
- EXPECT_EQ([session_controller_ items].front().get(),
- [session_controller_ currentItem]);
+ EXPECT_EQ(1U, [[session_controller_ entries] count]);
+ EXPECT_EQ(
+ GURL("http://www.another.url.com/"),
+ [session_controller_ URLForSessionAtIndex:0U]);
+ EXPECT_EQ(
+ [[session_controller_ entries] objectAtIndex:0U],
+ [session_controller_ currentEntry]);
}
TEST_F(CRWSessionControllerTest, addPendingItemAndCommitMultiple) {
@@ -210,13 +216,16 @@ void SetUp() override {
rendererInitiated:NO];
[session_controller_ commitPendingItem];
- EXPECT_EQ(2U, [session_controller_ items].size());
- EXPECT_EQ(GURL("http://www.url.com/"),
- [session_controller_ URLForNavigationItemAtIndex:0U]);
- EXPECT_EQ(GURL("http://www.another.url.com/"),
- [session_controller_ URLForNavigationItemAtIndex:1U]);
- EXPECT_EQ([session_controller_ items][1].get(),
- [session_controller_ currentItem]);
+ EXPECT_EQ(2U, [[session_controller_ entries] count]);
+ EXPECT_EQ(
+ GURL("http://www.url.com/"),
+ [session_controller_ URLForSessionAtIndex:0U]);
+ EXPECT_EQ(
+ GURL("http://www.another.url.com/"),
+ [session_controller_ URLForSessionAtIndex:1U]);
+ EXPECT_EQ(
+ [[session_controller_ entries] objectAtIndex:1U],
+ [session_controller_ currentEntry]);
}
TEST_F(CRWSessionControllerTest, addPendingItemAndDiscard) {
@@ -226,11 +235,11 @@ void SetUp() override {
rendererInitiated:NO];
[session_controller_ discardNonCommittedItems];
- EXPECT_EQ(0U, [session_controller_ items].size());
- EXPECT_EQ(nullptr, [session_controller_ currentItem]);
+ EXPECT_EQ(0U, [[session_controller_ entries] count]);
+ EXPECT_EQ(nil, [session_controller_ currentEntry]);
}
-// Tests discarding pending item added via |setPendingItemIndex:| call.
+// Tests discarding pending entry added via |setPendingItemIndex:| call.
TEST_F(CRWSessionControllerTest, setPendingItemIndexAndDiscard) {
[session_controller_ addPendingItem:GURL("http://www.example.com")
referrer:web::Referrer()
@@ -239,11 +248,11 @@ void SetUp() override {
[session_controller_ commitPendingItem];
[session_controller_ setPendingItemIndex:0];
- EXPECT_TRUE([session_controller_ pendingItem]);
+ EXPECT_TRUE([session_controller_ pendingEntry]);
EXPECT_EQ(0, [session_controller_ pendingItemIndex]);
[session_controller_ discardNonCommittedItems];
- EXPECT_FALSE([session_controller_ pendingItem]);
+ EXPECT_FALSE([session_controller_ pendingEntry]);
EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
}
@@ -260,11 +269,13 @@ void SetUp() override {
rendererInitiated:NO];
[session_controller_ commitPendingItem];
- EXPECT_EQ(1U, [session_controller_ items].size());
- EXPECT_EQ(GURL("http://www.another.url.com/"),
- [session_controller_ URLForNavigationItemAtIndex:0U]);
- EXPECT_EQ([session_controller_ items].front().get(),
- [session_controller_ currentItem]);
+ EXPECT_EQ(1U, [[session_controller_ entries] count]);
+ EXPECT_EQ(
+ GURL("http://www.another.url.com/"),
+ [session_controller_ URLForSessionAtIndex:0U]);
+ EXPECT_EQ(
+ [[session_controller_ entries] objectAtIndex:0U],
+ [session_controller_ currentEntry]);
}
TEST_F(CRWSessionControllerTest, addPendingItemAndCommitAndAddAndDiscard) {
@@ -280,41 +291,44 @@ void SetUp() override {
rendererInitiated:NO];
[session_controller_ discardNonCommittedItems];
- EXPECT_EQ(1U, [session_controller_ items].size());
- EXPECT_EQ(GURL("http://www.url.com/"),
- [session_controller_ URLForNavigationItemAtIndex:0U]);
- EXPECT_EQ([session_controller_ items].front().get(),
- [session_controller_ currentItem]);
+ EXPECT_EQ(1U, [[session_controller_ entries] count]);
+ EXPECT_EQ(
+ GURL("http://www.url.com/"),
+ [session_controller_ URLForSessionAtIndex:0U]);
+ EXPECT_EQ(
+ [[session_controller_ entries] objectAtIndex:0U],
+ [session_controller_ currentEntry]);
}
TEST_F(CRWSessionControllerTest,
- commitPendingItemWithoutPendingOrCommittedItem) {
+ commitPendingItemWithoutPendingOrCommittedEntry) {
[session_controller_ commitPendingItem];
- EXPECT_EQ(0U, [session_controller_ items].size());
- EXPECT_EQ(nullptr, [session_controller_ currentItem]);
+ EXPECT_EQ(0U, [[session_controller_ entries] count]);
+ EXPECT_EQ(nil, [session_controller_ currentEntry]);
}
TEST_F(CRWSessionControllerTest,
- commitPendingItemWithoutPendingItemWithCommittedItem) {
- // Setup committed item
+ commitPendingItemWithoutPendingEntryWithCommittedEntry) {
+ // Setup committed entry
[session_controller_ addPendingItem:GURL("http://www.url.com")
referrer:MakeReferrer("http://www.referer.com")
transition:ui::PAGE_TRANSITION_TYPED
rendererInitiated:NO];
[session_controller_ commitPendingItem];
- // Commit pending item when there is no such one
+ // Commit pending entry when there is no such one
[session_controller_ commitPendingItem];
- EXPECT_EQ(1U, [session_controller_ items].size());
- EXPECT_EQ([session_controller_ items].front().get(),
- [session_controller_ currentItem]);
+ EXPECT_EQ(1U, [[session_controller_ entries] count]);
+ EXPECT_EQ(
+ [[session_controller_ entries] objectAtIndex:0U],
+ [session_controller_ currentEntry]);
}
-// Tests that forward items are discarded after navigation item is committed.
-TEST_F(CRWSessionControllerTest, commitPendingItemWithExistingForwardItems) {
- // Make 3 items.
+// Tests that forward entries are discarded after navigation entry is committed.
+TEST_F(CRWSessionControllerTest, commitPendingItemWithExistingForwardEntries) {
+ // Make 3 entries.
[session_controller_ addPendingItem:GURL("http://www.example.com/0")
referrer:MakeReferrer("http://www.example.com/a")
transition:ui::PAGE_TRANSITION_LINK
@@ -331,24 +345,24 @@ void SetUp() override {
rendererInitiated:YES];
[session_controller_ commitPendingItem];
- // Go back to the first item.
+ // Go back to the first entry.
[session_controller_ goToItemAtIndex:0];
- // Create and commit a new pending item.
+ // Create and commit a new pending entry.
[session_controller_ addPendingItem:GURL("http://www.example.com/2")
referrer:MakeReferrer("http://www.example.com/c")
transition:ui::PAGE_TRANSITION_LINK
rendererInitiated:YES];
[session_controller_ commitPendingItem];
- // All forward items should go away.
- EXPECT_EQ(2U, [session_controller_ items].size());
- EXPECT_EQ(0U, [session_controller_ forwardItems].size());
+ // All forward entries should go away.
+ EXPECT_EQ(2U, [[session_controller_ entries] count]);
+ EXPECT_EQ(0U, [[session_controller_ forwardEntries] count]);
ASSERT_EQ(1, [session_controller_ currentNavigationIndex]);
ASSERT_EQ(0, [session_controller_ previousNavigationIndex]);
}
-// Tests committing pending item index from the middle.
+// Tests committing pending entry index from the middle.
TEST_F(CRWSessionControllerTest, commitPendingItemIndex) {
[session_controller_ addPendingItem:GURL("http://www.example.com/0")
referrer:web::Referrer()
@@ -365,62 +379,64 @@ void SetUp() override {
transition:ui::PAGE_TRANSITION_TYPED
rendererInitiated:NO];
[session_controller_ commitPendingItem];
- ASSERT_EQ(3U, [session_controller_ items].size());
+ ASSERT_EQ(3U, [[session_controller_ entries] count]);
- // Go to the middle, and commit first pending item index.
+ // Go to the middle, and commit first pending entry index.
[session_controller_ goToItemAtIndex:1];
[session_controller_ setPendingItemIndex:0];
ASSERT_EQ(0, [session_controller_ pendingItemIndex]);
- web::NavigationItemImpl* pending_item = [session_controller_ pendingItem];
- ASSERT_TRUE(pending_item);
+ base::scoped_nsobject<CRWSessionEntry> pendingEntry(
+ [[session_controller_ pendingEntry] retain]);
+ ASSERT_TRUE(pendingEntry);
ASSERT_EQ(1, [session_controller_ currentNavigationIndex]);
EXPECT_EQ(2, [session_controller_ previousNavigationIndex]);
[session_controller_ commitPendingItem];
- // Verify that pending item has been committed and current and previous item
+ // Verify that pending entry has been committed and current and previous entry
// indices updated.
- EXPECT_EQ(pending_item, [session_controller_ lastCommittedItem]);
+ EXPECT_EQ(pendingEntry, [session_controller_ lastCommittedEntry]);
EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
- EXPECT_FALSE([session_controller_ pendingItem]);
+ EXPECT_FALSE([session_controller_ pendingEntry]);
EXPECT_EQ(0, [session_controller_ currentNavigationIndex]);
EXPECT_EQ(1, [session_controller_ previousNavigationIndex]);
- EXPECT_EQ(3U, [session_controller_ items].size());
+ EXPECT_EQ(3U, [[session_controller_ entries] count]);
}
TEST_F(CRWSessionControllerTest,
- DiscardPendingItemWithoutPendingOrCommittedItem) {
+ DiscardPendingEntryWithoutPendingOrCommittedEntry) {
[session_controller_ discardNonCommittedItems];
- EXPECT_EQ(0U, [session_controller_ items].size());
- EXPECT_EQ(nil, [session_controller_ currentItem]);
+ EXPECT_EQ(0U, [[session_controller_ entries] count]);
+ EXPECT_EQ(nil, [session_controller_ currentEntry]);
}
TEST_F(CRWSessionControllerTest,
- DiscardPendingItemWithoutPendingItemWithCommittedItem) {
- // Setup committed item
+ DiscardPendingEntryWithoutPendingEntryWithCommittedEntry) {
+ // Setup committed entry
[session_controller_ addPendingItem:GURL("http://www.url.com")
referrer:MakeReferrer("http://www.referer.com")
transition:ui::PAGE_TRANSITION_TYPED
rendererInitiated:NO];
[session_controller_ commitPendingItem];
- // Discard noncommitted items when there is no such one
+ // Discard noncommitted entries when there is no such one
[session_controller_ discardNonCommittedItems];
- EXPECT_EQ(1U, [session_controller_ items].size());
- EXPECT_EQ([session_controller_ items].front().get(),
- [session_controller_ currentItem]);
+ EXPECT_EQ(1U, [[session_controller_ entries] count]);
+ EXPECT_EQ(
+ [[session_controller_ entries] objectAtIndex:0U],
+ [session_controller_ currentEntry]);
}
-TEST_F(CRWSessionControllerTest, updatePendingItemWithoutPendingItem) {
+TEST_F(CRWSessionControllerTest, updatePendingItemWithoutPendingEntry) {
[session_controller_ updatePendingItem:GURL("http://www.another.url.com")];
[session_controller_ commitPendingItem];
- EXPECT_EQ(0U, [session_controller_ items].size());
- EXPECT_EQ(nil, [session_controller_ currentItem]);
+ EXPECT_EQ(0U, [[session_controller_ entries] count]);
+ EXPECT_EQ(nil, [session_controller_ currentEntry]);
}
-TEST_F(CRWSessionControllerTest, updatePendingItemWithPendingItem) {
+TEST_F(CRWSessionControllerTest, updatePendingItemWithPendingEntry) {
[session_controller_ addPendingItem:GURL("http://www.url.com")
referrer:MakeReferrer("http://www.referer.com")
transition:ui::PAGE_TRANSITION_TYPED
@@ -433,7 +449,7 @@ void SetUp() override {
}
TEST_F(CRWSessionControllerTest,
- updatePendingItemWithPendingItemAlreadyCommited) {
+ updatePendingItemWithPendingEntryAlreadyCommited) {
[session_controller_ addPendingItem:GURL("http://www.url.com")
referrer:MakeReferrer("http://www.referer.com")
transition:ui::PAGE_TRANSITION_TYPED
@@ -442,16 +458,18 @@ void SetUp() override {
[session_controller_ updatePendingItem:GURL("http://www.another.url.com")];
[session_controller_ commitPendingItem];
- EXPECT_EQ(1U, [session_controller_ items].size());
- EXPECT_EQ(GURL("http://www.url.com/"),
- [session_controller_ URLForNavigationItemAtIndex:0U]);
- EXPECT_EQ([session_controller_ items].front().get(),
- [session_controller_ currentItem]);
+ EXPECT_EQ(1U, [[session_controller_ entries] count]);
+ EXPECT_EQ(
+ GURL("http://www.url.com/"),
+ [session_controller_ URLForSessionAtIndex:0U]);
+ EXPECT_EQ(
+ [[session_controller_ entries] objectAtIndex:0U],
+ [session_controller_ currentEntry]);
}
// Tests inserting session controller state.
TEST_F(CRWSessionControllerTest, InsertState) {
- // Add 1 committed and 1 pending item to target controller.
+ // Add 1 committed and 1 pending entry to target controller.
[session_controller_ addPendingItem:GURL("http://www.url.com/2")
referrer:web::Referrer()
transition:ui::PAGE_TRANSITION_TYPED
@@ -462,7 +480,7 @@ void SetUp() override {
transition:ui::PAGE_TRANSITION_TYPED
rendererInitiated:NO];
- // Create source session controller with 1 committed item.
+ // Create source session controller with 1 committed entry.
base::scoped_nsobject<CRWSessionController> other_session_controller(
[[CRWSessionController alloc] initWithWindowName:nil
openerId:nil
@@ -485,22 +503,22 @@ void SetUp() override {
insertStateFromSessionController:other_session_controller.get()];
EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);
- EXPECT_EQ(2U, [session_controller_ items].size());
+ EXPECT_EQ(2U, [[session_controller_ entries] count]);
EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);
EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
EXPECT_EQ(GURL("http://www.url.com/0"),
- [session_controller_ URLForNavigationItemAtIndex:0]);
+ [session_controller_ URLForSessionAtIndex:0]);
EXPECT_EQ(GURL("http://www.url.com/2"),
- [session_controller_ URLForNavigationItemAtIndex:1]);
+ [session_controller_ URLForSessionAtIndex:1]);
EXPECT_EQ(GURL("http://www.url.com/3"),
- [session_controller_ pendingItem]->GetURL());
+ [[session_controller_ pendingEntry] navigationItem]->GetURL());
}
// Tests inserting session controller state from empty session controller.
TEST_F(CRWSessionControllerTest, InsertStateFromEmptySessionController) {
- // Add 2 committed items to target controller.
+ // Add 2 committed entries to target controller.
[session_controller_ addPendingItem:GURL("http://www.url.com/0")
referrer:web::Referrer()
transition:ui::PAGE_TRANSITION_TYPED
@@ -526,21 +544,21 @@ void SetUp() override {
insertStateFromSessionController:other_session_controller.get()];
EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);
- EXPECT_EQ(2U, [session_controller_ items].size());
+ EXPECT_EQ(2U, [[session_controller_ entries] count]);
EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);
EXPECT_EQ(0, [session_controller_ previousNavigationIndex]);
EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
- EXPECT_FALSE([session_controller_ pendingItem]);
+ EXPECT_FALSE([session_controller_ pendingEntry]);
EXPECT_EQ(GURL("http://www.url.com/0"),
- [session_controller_ URLForNavigationItemAtIndex:0]);
+ [session_controller_ URLForSessionAtIndex:0]);
EXPECT_EQ(GURL("http://www.url.com/1"),
- [session_controller_ URLForNavigationItemAtIndex:1]);
+ [session_controller_ URLForSessionAtIndex:1]);
}
// Tests inserting session controller state to empty session controller.
TEST_F(CRWSessionControllerTest, InsertStateToEmptySessionController) {
- // Create source session controller with 2 committed items and one
- // pending item.
+ // Create source session controller with 2 committed entries and one
+ // pending entry.
base::scoped_nsobject<CRWSessionController> other_session_controller(
[[CRWSessionController alloc] initWithWindowName:nil
openerId:nil
@@ -568,22 +586,22 @@ void SetUp() override {
insertStateFromSessionController:other_session_controller.get()];
EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);
- EXPECT_EQ(2U, [session_controller_ items].size());
+ EXPECT_EQ(2U, [[session_controller_ entries] count]);
EXPECT_EQ(1, [session_controller_ currentNavigationIndex]);
EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
- EXPECT_FALSE([session_controller_ pendingItem]);
+ EXPECT_FALSE([session_controller_ pendingEntry]);
EXPECT_EQ(GURL("http://www.url.com/0"),
- [session_controller_ URLForNavigationItemAtIndex:0]);
+ [session_controller_ URLForSessionAtIndex:0]);
EXPECT_EQ(GURL("http://www.url.com/1"),
- [session_controller_ URLForNavigationItemAtIndex:1]);
+ [session_controller_ URLForSessionAtIndex:1]);
}
-// Tests inserting session controller state. Verifies that pending item index
+// Tests inserting session controller state. Verifies that pending entry index
// remains valid.
TEST_F(CRWSessionControllerTest,
- InsertStateWithPendingItemIndexInTargetController) {
- // Add 2 committed items and make the first item pending.
+ InsertStateWithPendingEntryIndexInTargetController) {
+ // Add 2 committed entries and make the first entry pending.
[session_controller_ addPendingItem:GURL("http://www.url.com/2")
referrer:web::Referrer()
transition:ui::PAGE_TRANSITION_TYPED
@@ -596,7 +614,7 @@ void SetUp() override {
[session_controller_ commitPendingItem];
[session_controller_ setPendingItemIndex:0];
- // Create source session controller with 1 committed item.
+ // Create source session controller with 1 committed entry.
base::scoped_nsobject<CRWSessionController> other_session_controller(
[[CRWSessionController alloc] initWithWindowName:nil
openerId:nil
@@ -615,25 +633,25 @@ void SetUp() override {
insertStateFromSessionController:other_session_controller.get()];
EXPECT_NSEQ(@"test-window", [session_controller_ windowName]);
- EXPECT_EQ(3U, [session_controller_ items].size());
+ EXPECT_EQ(3U, [[session_controller_ entries] count]);
EXPECT_EQ(2, [session_controller_ currentNavigationIndex]);
EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
EXPECT_EQ(1, [session_controller_ pendingItemIndex]);
EXPECT_EQ(GURL("http://www.url.com/0"),
- [session_controller_ URLForNavigationItemAtIndex:0]);
+ [session_controller_ URLForSessionAtIndex:0]);
EXPECT_EQ(GURL("http://www.url.com/2"),
- [session_controller_ URLForNavigationItemAtIndex:1]);
+ [session_controller_ URLForSessionAtIndex:1]);
EXPECT_EQ(GURL("http://www.url.com/2"),
- [session_controller_ pendingItem]->GetURL());
+ [[session_controller_ pendingEntry] navigationItem]->GetURL());
}
// Tests state of an empty session controller.
TEST_F(CRWSessionControllerTest, EmptyController) {
- EXPECT_EQ(0U, [session_controller_ items].size());
+ EXPECT_EQ(0U, [[session_controller_ entries] count]);
EXPECT_EQ(-1, [session_controller_ currentNavigationIndex]);
EXPECT_EQ(-1, [session_controller_ previousNavigationIndex]);
- EXPECT_FALSE([session_controller_ currentItem]);
- EXPECT_FALSE([session_controller_ pendingItem]);
+ EXPECT_FALSE([session_controller_ currentEntry]);
+ EXPECT_FALSE([session_controller_ pendingEntry]);
EXPECT_EQ(-1, [session_controller_ pendingItemIndex]);
}
@@ -660,10 +678,10 @@ void SetUp() override {
[[CRWSessionController alloc] initWithNavigationItems:std::move(items)
currentIndex:0
browserState:&browser_state_]);
- EXPECT_EQ(controller.get().items.size(), 0U);
+ EXPECT_EQ(controller.get().entries.count, 0U);
EXPECT_EQ(controller.get().currentNavigationIndex, -1);
EXPECT_EQ(controller.get().previousNavigationIndex, -1);
- EXPECT_FALSE(controller.get().currentItem);
+ EXPECT_FALSE(controller.get().currentEntry);
}
TEST_F(CRWSessionControllerTest, CreateWithNavList) {
@@ -679,17 +697,19 @@ void SetUp() override {
currentIndex:1
browserState:&browser_state_]);
- EXPECT_EQ(controller.get().items.size(), 3U);
+ EXPECT_EQ(controller.get().entries.count, 3U);
EXPECT_EQ(controller.get().currentNavigationIndex, 1);
EXPECT_EQ(controller.get().previousNavigationIndex, -1);
- // Sanity check the current item, the NavigationItem unit test will ensure
+ // Sanity check the current entry, the CRWSessionEntry unit test will ensure
// the entire object is created properly.
- EXPECT_EQ([controller currentItem]->GetURL(), GURL("http://www.yahoo.com"));
+ CRWSessionEntry* current_entry = controller.get().currentEntry;
+ EXPECT_EQ(current_entry.navigationItem->GetURL(),
+ GURL("http://www.yahoo.com"));
EXPECT_EQ([[controller openerId] length], 0UL);
}
-// Tests index of previous navigation item.
-TEST_F(CRWSessionControllerTest, PreviousNavigationItem) {
+// Tests index of previous navigation entry.
+TEST_F(CRWSessionControllerTest, PreviousNavigationEntry) {
EXPECT_EQ(session_controller_.get().previousNavigationIndex, -1);
[session_controller_ addPendingItem:GURL("http://www.url.com")
referrer:MakeReferrer("http://www.referer.com")
@@ -724,7 +744,7 @@ void SetUp() override {
EXPECT_EQ(session_controller_.get().previousNavigationIndex, 1);
}
-TEST_F(CRWSessionControllerTest, PushNewItem) {
+TEST_F(CRWSessionControllerTest, PushNewEntry) {
std::vector<std::unique_ptr<web::NavigationItem>> items;
items.push_back(CreateNavigationItem("http://www.firstpage.com",
"http://www.starturl.com", @"First"));
@@ -742,26 +762,29 @@ void SetUp() override {
[controller pushNewItemWithURL:pushPageGurl1
stateObject:stateObject1
transition:ui::PAGE_TRANSITION_LINK];
- web::NavigationItemImpl* pushedItem = [controller currentItem];
+ CRWSessionEntry* pushedEntry = [controller currentEntry];
+ web::NavigationItemImpl* pushedItem = pushedEntry.navigationItemImpl;
NSUInteger expectedCount = 2;
- EXPECT_EQ(expectedCount, [controller items].size());
- EXPECT_EQ(pushPageGurl1, pushedItem->GetURL());
+ EXPECT_EQ(expectedCount, controller.get().entries.count);
+ EXPECT_EQ(pushPageGurl1, pushedEntry.navigationItem->GetURL());
EXPECT_TRUE(pushedItem->IsCreatedFromPushState());
EXPECT_NSEQ(stateObject1, pushedItem->GetSerializedStateObject());
- EXPECT_EQ(GURL("http://www.firstpage.com/"), pushedItem->GetReferrer().url);
+ EXPECT_EQ(GURL("http://www.firstpage.com/"),
+ pushedEntry.navigationItem->GetReferrer().url);
- // Add another new item and check size and fields again.
+ // Add another new entry and check size and fields again.
GURL pushPageGurl2("http://www.firstpage.com/push2");
[controller pushNewItemWithURL:pushPageGurl2
stateObject:nil
transition:ui::PAGE_TRANSITION_LINK];
- pushedItem = [controller currentItem];
+ pushedEntry = [controller currentEntry];
+ pushedItem = pushedEntry.navigationItemImpl;
expectedCount = 3;
- EXPECT_EQ(expectedCount, [controller items].size());
- EXPECT_EQ(pushPageGurl2, pushedItem->GetURL());
+ 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, pushedItem->GetReferrer().url);
+ EXPECT_EQ(pushPageGurl1, pushedEntry.navigationItem->GetReferrer().url);
}
TEST_F(CRWSessionControllerTest, IsSameDocumentNavigation) {
@@ -785,12 +808,18 @@ void SetUp() override {
[[CRWSessionController alloc] initWithNavigationItems:std::move(items)
currentIndex:0
browserState:&browser_state_]);
- web::NavigationItemImpl* item0 = [controller items][0].get();
- web::NavigationItemImpl* item1 = [controller items][1].get();
- web::NavigationItemImpl* item2 = [controller items][2].get();
- web::NavigationItemImpl* item3 = [controller items][3].get();
- web::NavigationItemImpl* item4 = [controller items][4].get();
- web::NavigationItemImpl* item5 = [controller items][5].get();
+ web::NavigationItemImpl* item0 =
+ static_cast<web::NavigationItemImpl*>([controller items][0]);
+ web::NavigationItemImpl* item1 =
+ static_cast<web::NavigationItemImpl*>([controller items][1]);
+ web::NavigationItemImpl* item2 =
+ static_cast<web::NavigationItemImpl*>([controller items][2]);
+ web::NavigationItemImpl* item3 =
+ static_cast<web::NavigationItemImpl*>([controller items][3]);
+ web::NavigationItemImpl* item4 =
+ static_cast<web::NavigationItemImpl*>([controller items][4]);
+ web::NavigationItemImpl* item5 =
+ static_cast<web::NavigationItemImpl*>([controller items][5]);
item1->SetIsCreatedFromPushState(true);
item4->SetIsCreatedFromHashChange(true);
item5->SetIsCreatedFromPushState(true);
@@ -811,7 +840,7 @@ void SetUp() override {
[controller isSameDocumentNavigationBetweenItem:item2 andItem:item4]);
}
-TEST_F(CRWSessionControllerTest, UpdateCurrentItem) {
+TEST_F(CRWSessionControllerTest, UpdateCurrentEntry) {
std::vector<std::unique_ptr<web::NavigationItem>> items;
items.push_back(CreateNavigationItem("http://www.firstpage.com",
"http://www.starturl.com", @"First"));
@@ -827,30 +856,34 @@ void SetUp() override {
GURL replacePageGurl1("http://www.firstpage.com/#replace1");
NSString* stateObject1 = @"{'foo': 1}";
- // Replace current item and check the size of history and fields of the
- // modified item.
+ // Replace current entry and check the size of history and fields of the
+ // modified entry.
[controller updateCurrentItemWithURL:replacePageGurl1
stateObject:stateObject1];
- web::NavigationItemImpl* replacedItem = [controller currentItem];
+ CRWSessionEntry* replacedEntry = [controller currentEntry];
+ web::NavigationItemImpl* replacedItem = replacedEntry.navigationItemImpl;
NSUInteger expectedCount = 3;
- EXPECT_EQ(expectedCount, [controller items].size());
- EXPECT_EQ(replacePageGurl1, replacedItem->GetURL());
+ EXPECT_EQ(expectedCount, controller.get().entries.count);
+ EXPECT_EQ(replacePageGurl1, replacedEntry.navigationItem->GetURL());
EXPECT_FALSE(replacedItem->IsCreatedFromPushState());
EXPECT_NSEQ(stateObject1, replacedItem->GetSerializedStateObject());
- EXPECT_EQ(GURL("http://www.starturl.com/"), replacedItem->GetReferrer().url);
+ EXPECT_EQ(GURL("http://www.starturl.com/"),
+ replacedEntry.navigationItem->GetReferrer().url);
- // Replace current item and check size and fields again.
+ // Replace current entry and check size and fields again.
GURL replacePageGurl2("http://www.firstpage.com/#replace2");
[controller.get() updateCurrentItemWithURL:replacePageGurl2 stateObject:nil];
- replacedItem = [controller currentItem];
- EXPECT_EQ(expectedCount, [controller items].size());
- EXPECT_EQ(replacePageGurl2, replacedItem->GetURL());
+ replacedEntry = [controller currentEntry];
+ replacedItem = replacedEntry.navigationItemImpl;
+ EXPECT_EQ(expectedCount, controller.get().entries.count);
+ EXPECT_EQ(replacePageGurl2, replacedEntry.navigationItem->GetURL());
EXPECT_FALSE(replacedItem->IsCreatedFromPushState());
EXPECT_NSEQ(nil, replacedItem->GetSerializedStateObject());
- EXPECT_EQ(GURL("http://www.starturl.com/"), replacedItem->GetReferrer().url);
+ EXPECT_EQ(GURL("http://www.starturl.com/"),
+ replacedEntry.navigationItem->GetReferrer().url);
}
-TEST_F(CRWSessionControllerTest, TestBackwardForwardItems) {
+TEST_F(CRWSessionControllerTest, TestBackwardForwardEntries) {
[session_controller_ addPendingItem:GURL("http://www.example.com/0")
referrer:MakeReferrer("http://www.example.com/a")
transition:ui::PAGE_TRANSITION_LINK
@@ -873,25 +906,26 @@ void SetUp() override {
[session_controller_ commitPendingItem];
EXPECT_EQ(3, session_controller_.get().currentNavigationIndex);
- web::NavigationItemList backItems = [session_controller_ backwardItems];
- EXPECT_EQ(2U, backItems.size());
- EXPECT_EQ(0U, [session_controller_ forwardItems].size());
+ NSArray* backEntries = [session_controller_ backwardEntries];
+ EXPECT_EQ(2U, [backEntries count]);
+ EXPECT_EQ(0U, [[session_controller_ forwardEntries] count]);
EXPECT_EQ("http://www.example.com/redirect",
- backItems.front()->GetURL().spec());
+ [[backEntries objectAtIndex:0] navigationItem]->GetURL().spec());
[session_controller_ goToItemAtIndex:1];
- EXPECT_EQ(1U, [session_controller_ backwardItems].size());
- EXPECT_EQ(1U, [session_controller_ forwardItems].size());
+ EXPECT_EQ(1U, [[session_controller_ backwardEntries] count]);
+ EXPECT_EQ(1U, [[session_controller_ forwardEntries] count]);
[session_controller_ goToItemAtIndex:0];
- web::NavigationItemList forwardItems = [session_controller_ forwardItems];
- EXPECT_EQ(0U, [session_controller_ backwardItems].size());
- EXPECT_EQ(2U, forwardItems.size());
- EXPECT_EQ("http://www.example.com/2", forwardItems[1]->GetURL().spec());
+ NSArray* forwardEntries = [session_controller_ forwardEntries];
+ EXPECT_EQ(0U, [[session_controller_ backwardEntries] count]);
+ EXPECT_EQ(2U, [forwardEntries count]);
+ EXPECT_EQ("http://www.example.com/2",
+ [[forwardEntries objectAtIndex:1] navigationItem]->GetURL().spec());
}
-// Tests going to items with existing and non-existing indices.
-TEST_F(CRWSessionControllerTest, GoToItemAtIndex) {
+// Tests going to entries with existing and non-existing indices.
+TEST_F(CRWSessionControllerTest, GoToEntryAtIndex) {
[session_controller_ addPendingItem:GURL("http://www.example.com/0")
referrer:MakeReferrer("http://www.example.com/a")
transition:ui::PAGE_TRANSITION_LINK
@@ -919,23 +953,23 @@ void SetUp() override {
[session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
EXPECT_EQ(3, session_controller_.get().currentNavigationIndex);
EXPECT_EQ(2, session_controller_.get().previousNavigationIndex);
- EXPECT_TRUE(session_controller_.get().pendingItem);
- EXPECT_TRUE(session_controller_.get().transientItem);
+ EXPECT_TRUE(session_controller_.get().pendingEntry);
+ EXPECT_TRUE(session_controller_.get().transientEntry);
- // Going back should discard transient and pending items.
+ // Going back should discard transient and pending entries.
[session_controller_ goToItemAtIndex:1];
EXPECT_EQ(1, session_controller_.get().currentNavigationIndex);
EXPECT_EQ(3, session_controller_.get().previousNavigationIndex);
- EXPECT_FALSE(session_controller_.get().pendingItem);
- EXPECT_FALSE(session_controller_.get().transientItem);
+ EXPECT_FALSE(session_controller_.get().pendingEntry);
+ EXPECT_FALSE(session_controller_.get().transientEntry);
- // Going forward should discard transient item.
+ // Going forward should discard transient entry.
[session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
- EXPECT_TRUE(session_controller_.get().transientItem);
+ EXPECT_TRUE(session_controller_.get().transientEntry);
[session_controller_ goToItemAtIndex:2];
EXPECT_EQ(2, session_controller_.get().currentNavigationIndex);
EXPECT_EQ(1, session_controller_.get().previousNavigationIndex);
- EXPECT_FALSE(session_controller_.get().transientItem);
+ EXPECT_FALSE(session_controller_.get().transientEntry);
// Out of bounds navigations should be no-op.
[session_controller_ goToItemAtIndex:-1];
@@ -952,44 +986,47 @@ void SetUp() override {
}
// Tests that visible URL is the same as transient URL if there are no committed
-// items.
-TEST_F(CRWSessionControllerTest, VisibleItemWithSingleTransientItem) {
+// entries.
+TEST_F(CRWSessionControllerTest, VisibleEntryWithSingleTransientEntry) {
[session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
- web::NavigationItemImpl* visible_item = [session_controller_ visibleItem];
+ web::NavigationItem* visible_item =
+ [[session_controller_ visibleEntry] navigationItem];
ASSERT_TRUE(visible_item);
EXPECT_EQ("http://www.example.com/", visible_item->GetURL().spec());
}
// Tests that visible URL is the same as transient URL if there is a committed
-// item.
-TEST_F(CRWSessionControllerTest, VisibleItemWithCommittedAndTransientItems) {
+// entry.
+TEST_F(CRWSessionControllerTest, VisibleEntryWithCommittedAndTransientEntries) {
[session_controller_ addPendingItem:GURL("http://www.example.com/0")
referrer:MakeReferrer("http://www.example.com/a")
transition:ui::PAGE_TRANSITION_LINK
rendererInitiated:NO];
[session_controller_ commitPendingItem];
[session_controller_ addTransientItemWithURL:GURL("http://www.example.com")];
- web::NavigationItemImpl* visible_item = [session_controller_ visibleItem];
+ web::NavigationItem* visible_item =
+ [[session_controller_ visibleEntry] navigationItem];
ASSERT_TRUE(visible_item);
EXPECT_EQ("http://www.example.com/", visible_item->GetURL().spec());
}
// Tests that visible URL is the same as pending URL if it was user-initiated.
TEST_F(CRWSessionControllerTest,
- VisibleItemWithSingleUserInitiatedPendingItem) {
+ VisibleEntryWithSingleUserInitiatedPendingEntry) {
[session_controller_ addPendingItem:GURL("http://www.example.com/0")
referrer:MakeReferrer("http://www.example.com/a")
transition:ui::PAGE_TRANSITION_LINK
rendererInitiated:NO];
- web::NavigationItemImpl* visible_item = [session_controller_ visibleItem];
+ web::NavigationItem* visible_item =
+ [[session_controller_ visibleEntry] navigationItem];
ASSERT_TRUE(visible_item);
EXPECT_EQ("http://www.example.com/0", visible_item->GetURL().spec());
}
// Tests that visible URL is the same as pending URL if it was user-initiated
-// and there is a committed item.
+// and there is a committed entry.
TEST_F(CRWSessionControllerTest,
- VisibleItemWithCommittedAndUserInitiatedPendingItem) {
+ VisibleEntryWithCommittedAndUserInitiatedPendingEntry) {
[session_controller_ addPendingItem:GURL("http://www.example.com")
referrer:MakeReferrer("http://www.example.com/a")
transition:ui::PAGE_TRANSITION_LINK
@@ -999,7 +1036,8 @@ void SetUp() override {
referrer:MakeReferrer("http://www.example.com/b")
transition:ui::PAGE_TRANSITION_LINK
rendererInitiated:NO];
- web::NavigationItemImpl* visible_item = [session_controller_ visibleItem];
+ web::NavigationItem* visible_item =
+ [[session_controller_ visibleEntry] navigationItem];
ASSERT_TRUE(visible_item);
EXPECT_EQ("http://www.example.com/0", visible_item->GetURL().spec());
}
@@ -1007,19 +1045,20 @@ void SetUp() override {
// Tests that visible URL is not the same as pending URL if it was
// renderer-initiated.
TEST_F(CRWSessionControllerTest,
- VisibleItemWithSingleRendererInitiatedPendingItem) {
+ VisibleEntryWithSingleRendererInitiatedPendingEntry) {
[session_controller_ addPendingItem:GURL("http://www.example.com/0")
referrer:MakeReferrer("http://www.example.com/a")
transition:ui::PAGE_TRANSITION_LINK
rendererInitiated:YES];
- web::NavigationItemImpl* visible_item = [session_controller_ visibleItem];
+ web::NavigationItem* visible_item =
+ [[session_controller_ visibleEntry] navigationItem];
ASSERT_FALSE(visible_item);
}
// Tests that visible URL is not the same as pending URL if it was
-// renderer-initiated and there is a committed item.
+// renderer-initiated and there is a committed entry.
TEST_F(CRWSessionControllerTest,
- VisibleItemWithCommittedAndRendererInitiatedPendingItem) {
+ VisibleEntryWithCommittedAndRendererInitiatedPendingEntry) {
[session_controller_ addPendingItem:GURL("http://www.example.com")
referrer:MakeReferrer("http://www.example.com/a")
transition:ui::PAGE_TRANSITION_LINK
@@ -1029,14 +1068,15 @@ void SetUp() override {
referrer:MakeReferrer("http://www.example.com/b")
transition:ui::PAGE_TRANSITION_LINK
rendererInitiated:YES];
- web::NavigationItemImpl* visible_item = [session_controller_ visibleItem];
+ web::NavigationItem* visible_item =
+ [[session_controller_ visibleEntry] navigationItem];
ASSERT_TRUE(visible_item);
EXPECT_EQ("http://www.example.com/", visible_item->GetURL().spec());
}
// Tests that visible URL is not the same as pending URL created via pending
// navigation index.
-TEST_F(CRWSessionControllerTest, VisibleItemWithPendingNavigationIndex) {
+TEST_F(CRWSessionControllerTest, VisibleEntryWithPendingNavigationIndex) {
[session_controller_ addPendingItem:GURL("http://www.example.com")
referrer:MakeReferrer("http://www.example.com/a")
transition:ui::PAGE_TRANSITION_LINK
@@ -1050,14 +1090,15 @@ void SetUp() override {
[session_controller_ setPendingItemIndex:0];
- web::NavigationItemImpl* visible_item = [session_controller_ visibleItem];
+ web::NavigationItem* visible_item =
+ [[session_controller_ visibleEntry] navigationItem];
ASSERT_TRUE(visible_item);
EXPECT_EQ("http://www.example.com/0", visible_item->GetURL().spec());
}
-// Tests that |-backwardItems| is empty if all preceding items are
+// Tests that |-backwardEntries| is empty if all preceding entries are
// redirects.
-TEST_F(CRWSessionControllerTest, BackwardItemsForAllRedirects) {
+TEST_F(CRWSessionControllerTest, BackwardEntriesForAllRedirects) {
[session_controller_ addPendingItem:GURL("http://www.example.com")
referrer:MakeReferrer("http://www.example.com/a")
transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
@@ -1068,7 +1109,7 @@ void SetUp() override {
transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT
rendererInitiated:YES];
[session_controller_ commitPendingItem];
- EXPECT_EQ(0U, [session_controller_ backwardItems].size());
+ EXPECT_EQ(0U, [session_controller_ backwardEntries].count);
}
} // anonymous namespace
« no previous file with comments | « ios/web/navigation/crw_session_controller.mm ('k') | ios/web/navigation/crw_session_entry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698