Index: ios/web/navigation/crw_session_controller.mm |
diff --git a/ios/web/navigation/crw_session_controller.mm b/ios/web/navigation/crw_session_controller.mm |
index 5b3e0c540ee7151db9cb2c38a73a0a1fc1b9c13f..dfdd73bd22ed97371e391f5996dd7e9e67002032 100644 |
--- a/ios/web/navigation/crw_session_controller.mm |
+++ b/ios/web/navigation/crw_session_controller.mm |
@@ -599,14 +599,14 @@ - (BOOL)isSameDocumentNavigationBetweenItem:(web::NavigationItem*)firstItem |
andItem:(web::NavigationItem*)secondItem { |
if (!firstItem || !secondItem || firstItem == secondItem) |
return NO; |
- NSUInteger firstIndex = [self indexOfItem:firstItem]; |
- NSUInteger secondIndex = [self indexOfItem:secondItem]; |
- if (firstIndex == NSNotFound || secondIndex == NSNotFound) |
+ int firstIndex = [self indexOfItem:firstItem]; |
+ int secondIndex = [self indexOfItem:secondItem]; |
+ if (firstIndex == -1 || secondIndex == -1) |
return NO; |
- NSUInteger startIndex = firstIndex < secondIndex ? firstIndex : secondIndex; |
- NSUInteger endIndex = firstIndex < secondIndex ? secondIndex : firstIndex; |
+ int startIndex = firstIndex < secondIndex ? firstIndex : secondIndex; |
+ int endIndex = firstIndex < secondIndex ? secondIndex : firstIndex; |
- for (NSUInteger i = startIndex + 1; i <= endIndex; i++) { |
+ for (int i = startIndex + 1; i <= endIndex; i++) { |
web::NavigationItemImpl* item = self.items[i].get(); |
// Every item in the sequence has to be created from a hash change or |
// pushState() call. |
@@ -621,13 +621,13 @@ - (BOOL)isSameDocumentNavigationBetweenItem:(web::NavigationItem*)firstItem |
return YES; |
} |
-- (NSInteger)indexOfItem:(const web::NavigationItem*)item { |
+- (int)indexOfItem:(const web::NavigationItem*)item { |
DCHECK(item); |
for (size_t index = 0; index < self.items.size(); ++index) { |
if (self.items[index].get() == item) |
return index; |
} |
- return NSNotFound; |
+ return -1; |
} |
- (web::NavigationItemImpl*)itemAtIndex:(NSInteger)index { |