Remove Tab -currentNavigationItem.

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 310 matching lines @@
   // C++ bridge that receives notifications from the FaviconDriver.
   std::unique_ptr<FaviconDriverObserverBridge> faviconDriverObserverBridge_;
 
   // U2F call controller object.
   base::scoped_nsobject<U2FController> U2FController_;
 
   // C++ observer used to trigger snapshots after the removal of InfoBars.
   std::unique_ptr<TabInfoBarObserver> tabInfoBarObserver_;
 }
 
-// Returns the current NavigationItem for the sesionController associated with
-// this tab. Don't use this to get the underlying NavigationItem; instead
-// go through the NavigationManager.
-// This is nil if there's no NavigationManager.
-@property(nonatomic, readonly) web::NavigationItem* currentNavigationItem;
-
 // Returns the tab's reader mode controller. May contain nil if the feature is
 // disabled.
 @property(nonatomic, readonly) ReaderModeController* readerModeController;
 
 // Returns a list of FormSuggestionProviders to be queried for suggestions
 // in order of priority.
 - (NSArray*)suggestionProviders;
 
 // Returns a list of FormInputAccessoryViewProviders to be queried for an input
 // accessory view in order of priority.
@@ skipping 410 matching lines @@
 - (void)retrieveSnapshot:(void (^)(UIImage*))callback {
   [webControllerSnapshotHelper_
       retrieveSnapshotForWebController:self.webController
                              sessionID:self.tabId
                           withOverlays:[self snapshotOverlays]
                               callback:callback];
 }
 
 - (const GURL&)url {
   // See note in header; this method should be removed.
-  web::NavigationItem* item = [self currentNavigationItem];
+  web::NavigationItem* item =
+      [[self navigationManagerImpl]->GetSessionController() currentItem];
   return item ? item->GetVirtualURL() : GURL::EmptyGURL();
 }
 
 - (NSString*)title {
   base::string16 title = webStateImpl_->GetTitle();
   if (title.empty())
     title = l10n_util::GetStringUTF16(IDS_DEFAULT_TAB_TITLE);
   return base::SysUTF16ToNSString(title);
 }
 
@@ skipping 261 matching lines @@
     return;
 
   history::HistoryService* historyService =
       ios::HistoryServiceFactory::GetForBrowserState(
           browserState_, ServiceAccessType::IMPLICIT_ACCESS);
   DCHECK(historyService);
   historyService->SetPageTitle(self.url, base::SysNSStringToUTF16(title));
 }
 
 - (void)addCurrentEntryToHistoryDB {
-  DCHECK(self.currentNavigationItem);
+  DCHECK([self navigationManager]->GetVisibleItem());
   // If incognito, don't update history.
   if (browserState_->IsOffTheRecord())
     return;
 
   web::NavigationItem* item = [self navigationManager]->GetVisibleItem();
 
   // Do not update the history db for back/forward navigations.
   // TODO(crbug.com/661667): We do not currently tag the entry with a
   // FORWARD_BACK transition. Fix.
   if (item->GetTransitionType() & ui::PAGE_TRANSITION_FORWARD_BACK)
@@ skipping 102 matching lines @@
       !PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_RELOAD) &&
       (transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK) == 0) {
     base::RecordAction(UserMetricsAction("MobileTabClobbered"));
   }
   if ([parentTabModel_ tabUsageRecorder])
     [parentTabModel_ tabUsageRecorder]->RecordPageLoadStart(self);
 
   // Reset |isVoiceSearchResultsTab| since a new page is being navigated to.
   self.isVoiceSearchResultsTab = NO;
 
+  web::NavigationItem* navigationItem =
+      [self navigationManager]->GetPendingItem();
+
+  // TODO(crbug.com/676129): the pending item is not correctly set when the
+  // page is reloading, use the last committed item if pending item is null.
+  // Remove this once tracking bug is fixed.
+  if (!navigationItem)
+    navigationItem = [self navigationManager]->GetLastCommittedItem();
+
   [[OmniboxGeolocationController sharedInstance]
-      addLocationToNavigationItem:self.currentNavigationItem
+      addLocationToNavigationItem:navigationItem
                      browserState:browserState_];
 }
 
 - (void)loadSessionTab:(const sessions::SessionTab*)sessionTab {
   DCHECK(sessionTab);
   [self replaceHistoryWithNavigations:sessionTab->navigations
                          currentIndex:sessionTab->current_navigation_index];
 }
 
 - (void)reload {
@@ skipping 85 matching lines @@
 
   LegacyTabHelper::RemoveFromWebState(webStateImpl_.get());
   webStateImpl_.reset();
 }
 
 - (void)dismissModals {
   [openInController_ disable];
   [self.webController dismissModals];
 }
 
-- (web::NavigationItem*)currentNavigationItem {
-  if (![self navigationManager])
-    return nil;
-  return [[self navigationManagerImpl]->GetSessionController() currentItem];
-}
-
 - (void)setShouldObserveInfoBarManager:(BOOL)shouldObserveInfoBarManager {
   tabInfoBarObserver_->SetShouldObserveInfoBarManager(
       shouldObserveInfoBarManager);
 }
 
 - (void)setShouldObserveFaviconChanges:(BOOL)shouldObserveFaviconChanges {
   if (shouldObserveFaviconChanges) {
     favicon::FaviconDriver* faviconDriver =
         favicon::WebFaviconDriver::FromWebState(self.webState);
     // Some MockWebContents used in tests do not support the FaviconDriver.
@@ skipping 443 matching lines @@
   DCHECK(self.webController.loadPhase == web::PAGE_LOADED);
 
   // Cancel prerendering if response is "application/octet-stream". It can be a
   // video file which should not be played from preload tab (crbug.com/436813).
   if (isPrerenderTab_ &&
       self.webState->GetContentsMimeType() == "application/octet-stream") {
     [delegate_ discardPrerender];
   }
 
   bool wasPost = false;
-  if (self.currentNavigationItem)
-    wasPost = self.currentNavigationItem->HasPostData();
-  GURL lastCommittedURL = self.webState->GetLastCommittedURL();
+  GURL lastCommittedURL;
+  web::NavigationItem* lastCommittedItem =
+      [self navigationManager]->GetLastCommittedItem();
+  if (lastCommittedItem) {
+    wasPost = lastCommittedItem->HasPostData();
+    lastCommittedURL = lastCommittedItem->GetVirtualURL();
+  }
   if (loadSuccess)
     [autoReloadBridge_ loadFinishedForURL:lastCommittedURL wasPost:wasPost];
   else
     [autoReloadBridge_ loadFailedForURL:lastCommittedURL wasPost:wasPost];
   [webControllerSnapshotHelper_ setSnapshotCoalescingEnabled:YES];
   if (!loadSuccess) {
     [fullScreenController_ disableFullScreen];
   }
   [self recordInterfaceOrientation];
   navigation_metrics::OriginsSeenService* originsSeenService =
@@ skipping 464 matching lines @@
 
 - (TabModel*)parentTabModel {
   return parentTabModel_;
 }
 
 - (FormInputAccessoryViewController*)inputAccessoryViewController {
   return inputAccessoryViewController_.get();
 }
 
 @end