Removed CRWSessionEntry from Tab's interface.

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 107 matching lines @@
 #include "ios/chrome/browser/web/network_activity_indicator_tab_helper.h"
 #import "ios/chrome/browser/web/passkit_dialog_provider.h"
 #include "ios/chrome/browser/web/print_observer.h"
 #import "ios/chrome/browser/web/repost_form_tab_helper.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/crw_session_entry.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"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/referrer.h"
 #include "ios/web/public/ssl_status.h"
 #include "ios/web/public/url_scheme_util.h"
 #include "ios/web/public/url_util.h"
@@ skipping 170 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 sessionEntry for the sesionController associated with
+// 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) CRWSessionEntry* currentSessionEntry;
+@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
@@ skipping 14 matching lines @@
 
 // Returns the OpenInController for this tab.
 - (OpenInController*)openInController;
 
 // Calls the model and ask to close this tab.
 - (void)closeThisTab;
 
 // Initialize the Native App Launcher controller.
 - (void)initNativeAppNavigationController;
 
-// YES if toEntry is behind fromEntry in the current history stack.
-- (BOOL)navigationIsBackwards:(const CRWSessionEntry*)fromEntry
-                      toEntry:(const CRWSessionEntry*)toEntry;
-
 // Opens a link in an external app. Returns YES iff |url| is launched in an
 // external app.
 - (BOOL)openExternalURL:(const GURL&)url linkClicked:(BOOL)linkClicked;
 
 // Handles exportable files if possible.
 - (void)handleExportableFile:(net::HttpResponseHeaders*)headers;
 
 // Called after the session history is replaced, useful for updating members
 // with new sessionID.
 - (void)didReplaceSessionHistory;
@@ skipping 371 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 currentSessionEntry] navigationItem];
+  web::NavigationItem* item = [self currentNavigationItem];
   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 236 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.currentSessionEntry);
+  DCHECK(self.currentNavigationItem);
   // 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 103 matching lines @@
       (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;
 
   [[OmniboxGeolocationController sharedInstance]
-      addLocationToNavigationItem:self.currentSessionEntry.navigationItem
+      addLocationToNavigationItem:self.currentNavigationItem
                      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];
 }
 
-- (CRWSessionEntry*)currentSessionEntry {
+- (web::NavigationItem*)currentNavigationItem {
   if (![self navigationManager])
     return nil;
-  return [[self navigationManager]->GetSessionController() currentEntry];
+  return [[self navigationManager]->GetSessionController() currentItem];
 }
 
 - (void)setShouldObserveInfoBarManager:(BOOL)shouldObserveInfoBarManager {
   tabInfoBarObserver_->SetShouldObserveInfoBarManager(
       shouldObserveInfoBarManager);
 }
 
 - (void)setShouldObserveFaviconChanges:(BOOL)shouldObserveFaviconChanges {
   if (shouldObserveFaviconChanges) {
     favicon::FaviconDriver* faviconDriver =
@@ skipping 25 matching lines @@
 }
 
 - (BOOL)canGoBack {
   return self.navigationManager && self.navigationManager->CanGoBack();
 }
 
 - (BOOL)canGoForward {
   return self.navigationManager && self.navigationManager->CanGoForward();
 }
 
-- (void)goToEntry:(CRWSessionEntry*)entry {
-  DCHECK(entry);
+- (void)goToItem:(const web::NavigationItem*)item {
+  DCHECK(item);
 
   if (self.navigationManager) {
     CRWSessionController* sessionController =
         self.navigationManager->GetSessionController();
-    DCHECK([sessionController.entries containsObject:entry]);
-    NSUInteger index = [sessionController.entries indexOfObject:entry];
-    self.navigationManager->GoToIndex(index);
+    NSInteger itemIndex = [sessionController indexOfItem:item];
+    DCHECK_NE(itemIndex, NSNotFound);
+    self.navigationManager->GoToIndex(itemIndex);
   }
 }
 
 - (BOOL)openExternalURL:(const GURL&)url linkClicked:(BOOL)linkClicked {
   if (!externalAppLauncher_.get())
     externalAppLauncher_.reset([[ExternalAppLauncher alloc] init]);
 
   // This method may release CRWWebController which may cause a crash
   // (crbug.com/393949).
   [[self.webController retain] autorelease];
@@ skipping 204 matching lines @@
   [self.readerModeController exitReaderMode];
 }
 
 #pragma mark -
 
 - (void)openAppStore:(NSString*)appId {
   [storeKitLauncher_ openAppStore:appId];
 }
 
 - (BOOL)useDesktopUserAgent {
-  web::NavigationItem* currentItem = self.currentSessionEntry.navigationItem;
+  web::NavigationItem* currentItem = self.currentNavigationItem;
   return currentItem && currentItem->IsOverridingUserAgent();
 }
 
 - (void)enableDesktopUserAgent {
   DCHECK_EQ(self.useDesktopUserAgent, NO);
   DCHECK([self navigationManager]);
   [[self navigationManager]->GetSessionController()
           useDesktopUserAgentForNextPendingItem];
 }
 
 - (void)reloadForDesktopUserAgent {
   // |loadWithParams| will recreate the removed UIWebView.
   [self.webController requirePageReconstruction];
 
   // TODO(crbug.com/228171): A hack in session_controller -addPendingItem
   // discusses making tab responsible for distinguishing history stack
   // navigation from new navigations. Because we want a new navigation here, we
   // use |PAGE_TRANSITION_FORM_SUBMIT|. When session_controller changes, so
   // should this.
   ui::PageTransition transition =
       ui::PageTransitionFromInt(ui::PAGE_TRANSITION_FORM_SUBMIT);
   DCHECK([self navigationManager]);
   CRWSessionController* sessionController =
       [self navigationManager]->GetSessionController();
-  CRWSessionEntry* lastUserEntry = [sessionController lastUserEntry];
-  if (!lastUserEntry)
+  web::NavigationItem* lastUserItem = [sessionController lastUserItem];
+  if (!lastUserItem)
     return;
 
   // |originalUrl| will be empty if a page was open by DOM.
-  GURL reloadURL(lastUserEntry.navigationItem->GetOriginalRequestURL());
+  GURL reloadURL(lastUserItem->GetOriginalRequestURL());
   if (reloadURL.is_empty()) {
     DCHECK(sessionController.openedByDOM);
-    reloadURL = [lastUserEntry navigationItem]->GetVirtualURL();
+    reloadURL = lastUserItem->GetVirtualURL();
   }
 
   web::NavigationManager::WebLoadParams params(reloadURL);
-  params.referrer = lastUserEntry.navigationItem->GetReferrer();
+  params.referrer = lastUserItem->GetReferrer();
   params.transition_type = transition;
   if (self.navigationManager)
     self.navigationManager->LoadURLWithParams(params);
 }
 
 - (id<SnapshotOverlayProvider>)snapshotOverlayProvider {
   return snapshotOverlayProvider_.get();
 }
 
 - (void)setSnapshotOverlayProvider:
@@ skipping 163 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.currentSessionEntry)
-    wasPost = self.currentSessionEntry.navigationItem->HasPostData();
+  if (self.currentNavigationItem)
+    wasPost = self.currentNavigationItem->HasPostData();
   GURL lastCommittedURL = self.webState->GetLastCommittedURL();
   if (loadSuccess)
     [autoReloadBridge_ loadFinishedForURL:lastCommittedURL wasPost:wasPost];
   else
     [autoReloadBridge_ loadFailedForURL:lastCommittedURL wasPost:wasPost];
   [webControllerSnapshotHelper_ setSnapshotCoalescingEnabled:YES];
   if (!loadSuccess) {
     [fullScreenController_ disableFullScreen];
   }
   [self recordInterfaceOrientation];
@@ skipping 426 matching lines @@
   [inputAccessoryViewController_ wasShown];
 }
 
 - (void)wasHidden {
   visible_ = NO;
   [self updateFullscreenWithToolbarVisible:YES];
   [self.webController wasHidden];
   [inputAccessoryViewController_ wasHidden];
 }
 
-- (BOOL)navigationIsBackwards:(const CRWSessionEntry*)fromEntry
-                      toEntry:(const CRWSessionEntry*)toEntry {
-  DCHECK([self navigationManager]);
-  NSArray* entries = [self navigationManager]->GetSessionController().entries;
-  NSInteger fromIndex = [entries indexOfObject:fromEntry];
-  NSInteger toIndex = [entries indexOfObject:toEntry];
-  return (fromIndex != NSNotFound && toIndex != NSNotFound &&
-          fromIndex > toIndex);
-}
-
 @end
 
 #pragma mark - TestingSupport
 
 @implementation Tab (TestingSupport)
 
 - (void)replaceExternalAppLauncher:(id)externalAppLauncher {
   externalAppLauncher_.reset([externalAppLauncher retain]);
 }
 
 - (TabModel*)parentTabModel {
   return parentTabModel_;
 }
 
 - (FormInputAccessoryViewController*)inputAccessoryViewController {
   return inputAccessoryViewController_.get();
 }
 
 @end