Added NavigationManager::GetIndexOfItem().

ios/chrome/browser/tabs/tab.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/tabs/tab.h"
 
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
 
 #include <utility>
@@ skipping 90 matching lines @@
 #import "ios/chrome/browser/web/auto_reload_bridge.h"
 #import "ios/chrome/browser/web/external_app_launcher.h"
 #import "ios/chrome/browser/web/navigation_manager_util.h"
 #import "ios/chrome/browser/web/passkit_dialog_provider.h"
 #include "ios/chrome/browser/web/print_observer.h"
 #import "ios/chrome/browser/xcallback_parameters.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #import "ios/public/provider/chrome/browser/native_app_launcher/native_app_metadata.h"
 #import "ios/public/provider/chrome/browser/native_app_launcher/native_app_whitelist_manager.h"
-#import "ios/web/navigation/crw_session_controller.h"
 #import "ios/web/navigation/navigation_item_impl.h"
 #import "ios/web/navigation/navigation_manager_impl.h"
 #include "ios/web/public/favicon_status.h"
 #include "ios/web/public/favicon_url.h"
 #include "ios/web/public/interstitials/web_interstitial.h"
 #include "ios/web/public/load_committed_details.h"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/referrer.h"
 #import "ios/web/public/serializable_user_data_manager.h"
 #include "ios/web/public/ssl_status.h"
@@ skipping 947 matching lines @@
 - (BOOL)canGoBack {
   return self.navigationManager && self.navigationManager->CanGoBack();
 }
 
 - (BOOL)canGoForward {
   return self.navigationManager && self.navigationManager->CanGoForward();
 }
 
 - (void)goToItem:(const web::NavigationItem*)item {
   DCHECK(item);
-
-  if (self.navigationManager) {
-    CRWSessionController* sessionController =
-        [self navigationManagerImpl]->GetSessionController();
-    NSInteger itemIndex = [sessionController indexOfItem:item];
-    DCHECK_NE(itemIndex, NSNotFound);
-    self.navigationManager->GoToIndex(itemIndex);
-  }
+  DCHECK(self.navigationManager);

[Eugene But (OOO till 7-30), 2017/06/02 18:08:08]

No need to DCHECK before dereferencing the pointer.

[kkhorimoto, 2017/06/02 18:28:58]

Done.

+  int index = self.navigationManager->GetIndexOfItem(item);
+  DCHECK_NE(index, NSNotFound);

[Eugene But (OOO till 7-30), 2017/06/02 18:08:08]

NSNotFound is NSInteger, so it will never be equal to int on 64-bit platform
(int there is 32-bit and NSInteger is 64-bit)

[kkhorimoto, 2017/06/02 18:28:58]

Done.

+  self.navigationManager->GoToIndex(index);
 }
 
 - (BOOL)openExternalURL:(const GURL&)url
               sourceURL:(const GURL&)sourceURL
             linkClicked:(BOOL)linkClicked {
   if (!_externalAppLauncher)
     _externalAppLauncher = [[ExternalAppLauncher alloc] init];
 
   // Make a local url copy for possible modification.
   GURL finalURL = url;
@@ skipping 804 matching lines @@
 
 - (TabModel*)parentTabModel {
   return _parentTabModel;
 }
 
 - (FormInputAccessoryViewController*)inputAccessoryViewController {
   return _inputAccessoryViewController;
 }
 
 @end