| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import "ios/web/navigation/crw_session_controller.h" | 5 #import "ios/web/navigation/crw_session_controller.h" |
| 6 | 6 |
| 7 #import <Foundation/Foundation.h> | 7 #import <Foundation/Foundation.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 790 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 801 // Push state navigation. | 801 // Push state navigation. |
| 802 items.push_back( | 802 items.push_back( |
| 803 CreateNavigationItem("http://foo.com/bar", "http://foo.com", @"Fifth")); | 803 CreateNavigationItem("http://foo.com/bar", "http://foo.com", @"Fifth")); |
| 804 // Push state navigation. | 804 // Push state navigation. |
| 805 items.push_back(CreateNavigationItem("http://foo.com/bar#bar", | 805 items.push_back(CreateNavigationItem("http://foo.com/bar#bar", |
| 806 "http://foo.com/bar", @"Sixth")); | 806 "http://foo.com/bar", @"Sixth")); |
| 807 base::scoped_nsobject<CRWSessionController> controller( | 807 base::scoped_nsobject<CRWSessionController> controller( |
| 808 [[CRWSessionController alloc] initWithNavigationItems:std::move(items) | 808 [[CRWSessionController alloc] initWithNavigationItems:std::move(items) |
| 809 currentIndex:0 | 809 currentIndex:0 |
| 810 browserState:&browser_state_]); | 810 browserState:&browser_state_]); |
| 811 web::NavigationItemImpl* item0 = | 811 web::NavigationItemImpl* item0 = [controller items][0].get(); |
| 812 static_cast<web::NavigationItemImpl*>([controller items][0]); | 812 web::NavigationItemImpl* item1 = [controller items][1].get(); |
| 813 web::NavigationItemImpl* item1 = | 813 web::NavigationItemImpl* item2 = [controller items][2].get(); |
| 814 static_cast<web::NavigationItemImpl*>([controller items][1]); | 814 web::NavigationItemImpl* item3 = [controller items][3].get(); |
| 815 web::NavigationItemImpl* item2 = | 815 web::NavigationItemImpl* item4 = [controller items][4].get(); |
| 816 static_cast<web::NavigationItemImpl*>([controller items][2]); | 816 web::NavigationItemImpl* item5 = [controller items][5].get(); |
| 817 web::NavigationItemImpl* item3 = | |
| 818 static_cast<web::NavigationItemImpl*>([controller items][3]); | |
| 819 web::NavigationItemImpl* item4 = | |
| 820 static_cast<web::NavigationItemImpl*>([controller items][4]); | |
| 821 web::NavigationItemImpl* item5 = | |
| 822 static_cast<web::NavigationItemImpl*>([controller items][5]); | |
| 823 item1->SetIsCreatedFromPushState(true); | 817 item1->SetIsCreatedFromPushState(true); |
| 824 item4->SetIsCreatedFromHashChange(true); | 818 item4->SetIsCreatedFromHashChange(true); |
| 825 item5->SetIsCreatedFromPushState(true); | 819 item5->SetIsCreatedFromPushState(true); |
| 826 | 820 |
| 827 EXPECT_FALSE( | 821 EXPECT_FALSE( |
| 828 [controller isSameDocumentNavigationBetweenItem:item0 andItem:item0]); | 822 [controller isSameDocumentNavigationBetweenItem:item0 andItem:item0]); |
| 829 EXPECT_TRUE( | 823 EXPECT_TRUE( |
| 830 [controller isSameDocumentNavigationBetweenItem:item0 andItem:item1]); | 824 [controller isSameDocumentNavigationBetweenItem:item0 andItem:item1]); |
| 831 EXPECT_TRUE( | 825 EXPECT_TRUE( |
| 832 [controller isSameDocumentNavigationBetweenItem:item5 andItem:item3]); | 826 [controller isSameDocumentNavigationBetweenItem:item5 andItem:item3]); |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1106 [session_controller_ commitPendingItem]; | 1100 [session_controller_ commitPendingItem]; |
| 1107 [session_controller_ addPendingItem:GURL("http://www.example.com/0") | 1101 [session_controller_ addPendingItem:GURL("http://www.example.com/0") |
| 1108 referrer:MakeReferrer("http://www.example.com/b") | 1102 referrer:MakeReferrer("http://www.example.com/b") |
| 1109 transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT | 1103 transition:ui::PAGE_TRANSITION_CLIENT_REDIRECT |
| 1110 rendererInitiated:YES]; | 1104 rendererInitiated:YES]; |
| 1111 [session_controller_ commitPendingItem]; | 1105 [session_controller_ commitPendingItem]; |
| 1112 EXPECT_EQ(0U, [session_controller_ backwardEntries].count); | 1106 EXPECT_EQ(0U, [session_controller_ backwardEntries].count); |
| 1113 } | 1107 } |
| 1114 | 1108 |
| 1115 } // anonymous namespace | 1109 } // anonymous namespace |
| OLD | NEW |