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

Unified Diff: ios/web/web_state/ui/crw_web_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/web_state/ui/crw_web_controller.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/web_state/ui/crw_web_controller_unittest.mm
diff --git a/ios/web/web_state/ui/crw_web_controller_unittest.mm b/ios/web/web_state/ui/crw_web_controller_unittest.mm
index 44638df04d1992c8ef935caf83000e192362609e..749b5b6ca2661fa91d0d003268f0381550f2f8f1 100644
--- a/ios/web/web_state/ui/crw_web_controller_unittest.mm
+++ b/ios/web/web_state/ui/crw_web_controller_unittest.mm
@@ -674,19 +674,19 @@ void TearDown() override {
typedef web::WebTestWithWebController CRWWebControllerNavigationTest;
// Tests navigation between 2 URLs which differ only by fragment.
-TEST_F(CRWWebControllerNavigationTest, GoToItemWithoutDocumentChange) {
+TEST_F(CRWWebControllerNavigationTest, GoToEntryWithoutDocumentChange) {
LoadHtml(@"<html><body></body></html>", GURL("https://chromium.test"));
LoadHtml(@"<html><body></body></html>", GURL("https://chromium.test#hash"));
NavigationManagerImpl& nav_manager =
web_controller().webStateImpl->GetNavigationManagerImpl();
CRWSessionController* session_controller = nav_manager.GetSessionController();
- EXPECT_EQ(2U, session_controller.items.size());
- EXPECT_EQ(session_controller.items.back().get(),
- session_controller.currentItem);
+ EXPECT_EQ(2U, session_controller.entries.count);
+ EXPECT_NSEQ(session_controller.entries.lastObject,
+ session_controller.currentEntry);
[web_controller() goToItemAtIndex:0];
- EXPECT_EQ(session_controller.items.front().get(),
- session_controller.currentItem);
+ EXPECT_NSEQ(session_controller.entries.firstObject,
+ session_controller.currentEntry);
}
// Tests that didShowPasswordInputOnHTTP updates the SSLStatus to indicate that
« no previous file with comments | « ios/web/web_state/ui/crw_web_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698