Remove CRWSessionController usage from BrowserViewController.

ios/chrome/browser/ui/browser_view_controller.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/ui/browser_view_controller.h"
 
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <PassKit/PassKit.h>
 #import <Photos/Photos.h>
@@ skipping 153 matching lines @@
 #include "ios/chrome/grit/ios_strings.h"
 #import "ios/net/request_tracker.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #include "ios/public/provider/chrome/browser/ui/app_rating_prompt.h"
 #include "ios/public/provider/chrome/browser/ui/default_ios_web_view_factory.h"
 #import "ios/public/provider/chrome/browser/voice/voice_search_bar.h"
 #import "ios/public/provider/chrome/browser/voice/voice_search_bar_owner.h"
 #include "ios/public/provider/chrome/browser/voice/voice_search_controller.h"
 #include "ios/public/provider/chrome/browser/voice/voice_search_controller_delegate.h"
 #include "ios/public/provider/chrome/browser/voice/voice_search_provider.h"
-#import "ios/web/navigation/crw_session_controller.h"

[Eugene But (OOO till 7-30), 2017/03/10 16:23:27]

Could you please cleanup ios/chrome/browser/ui/DEPS as well

[kkhorimoto, 2017/03/10 23:02:19]

Done.

 #include "ios/web/navigation/navigation_manager_impl.h"
 #include "ios/web/public/active_state_manager.h"
 #include "ios/web/public/navigation_item.h"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/referrer_util.h"
 #include "ios/web/public/ssl_status.h"
 #include "ios/web/public/url_scheme_util.h"
 #include "ios/web/public/user_agent.h"
 #include "ios/web/public/web_client.h"
 #import "ios/web/public/web_state/context_menu_params.h"
@@ skipping 3208 matching lines @@
 
 - (void)showTabHistoryPopupForBackwardHistory {
   DCHECK(self.visible || self.dismissingModal);
 
   // Dismiss the omnibox (if open).
   [_toolbarController cancelOmniboxEdit];
   // Dismiss the soft keyboard (if open).
   Tab* tab = [_model currentTab];
   [tab.webController dismissKeyboard];
 
-  DCHECK([tab navigationManager]);
-  CRWSessionController* sc =
-      [tab navigationManagerImpl]->GetSessionController();
-  [_toolbarController showTabHistoryPopupInView:[self view]
-                                      withItems:[sc backwardItems]
-                                 forBackHistory:YES];
+  web::NavigationManager* navigationManager = [tab navigationManager];
+  DCHECK(navigationManager);

[Eugene But (OOO till 7-30), 2017/03/10 16:23:27]

nit: There is no need for DCHECK |navigationManager->GetBackwardItems()| will
crash anyway

[kkhorimoto, 2017/03/10 23:02:19]

Done.

+  [_toolbarController
+      showTabHistoryPopupInView:[self view]
+                      withItems:navigationManager->GetBackwardItems()
+                 forBackHistory:YES];
 }
 
 - (void)showTabHistoryPopupForForwardHistory {
   DCHECK(self.visible || self.dismissingModal);
 
   // Dismiss the omnibox (if open).
   [_toolbarController cancelOmniboxEdit];
   // Dismiss the soft keyboard (if open).
   Tab* tab = [_model currentTab];
   [tab.webController dismissKeyboard];
 
-  DCHECK([tab navigationManager]);
-  CRWSessionController* sc =
-      [tab navigationManagerImpl]->GetSessionController();
-  [_toolbarController showTabHistoryPopupInView:[self view]
-                                      withItems:[sc forwardItems]
-                                 forBackHistory:NO];
+  web::NavigationManager* navigationManager = [tab navigationManager];
+  DCHECK(navigationManager);
+  [_toolbarController
+      showTabHistoryPopupInView:[self view]
+                      withItems:navigationManager->GetForwardItems()
+                 forBackHistory:NO];
 }
 
 - (void)navigateToSelectedEntry:(id)sender {
   DCHECK([sender isKindOfClass:[TabHistoryCell class]]);
   TabHistoryCell* selectedCell = (TabHistoryCell*)sender;
   [[_model currentTab] goToItem:selectedCell.item];
   [_toolbarController dismissTabHistoryPopup];
 }
 
 - (void)print {
@@ skipping 173 matching lines @@
     return;
   }
 
   if (url == [_preloadController prerenderedURL]) {
     Tab* oldTab = [_model currentTab];
     Tab* newTab = [_preloadController releasePrerenderContents];
     DCHECK(oldTab);
     DCHECK(newTab);
     if (oldTab && newTab) {
       [oldTab recordStateInHistory];
-      DCHECK([newTab navigationManager]);
-      CRWSessionController* newHistory =
-          [newTab navigationManagerImpl]->GetSessionController();
-      DCHECK([oldTab navigationManager]);
-      CRWSessionController* oldHistory =
-          [oldTab navigationManagerImpl]->GetSessionController();
-      [newHistory insertStateFromSessionController:oldHistory];
+      web::NavigationManager* newNavigationManager = [newTab navigationManager];
+      web::NavigationManager* oldNavigationManager = [oldTab navigationManager];
+      DCHECK(newNavigationManager);

[Eugene But (OOO till 7-30), 2017/03/10 16:23:27]

ditto

[kkhorimoto, 2017/03/10 23:02:19]

Done.

+      DCHECK(oldNavigationManager);
+      newNavigationManager->InsertStateFromManager(oldNavigationManager);
       [[newTab nativeAppNavigationController]
           copyStateFrom:[oldTab nativeAppNavigationController]];
       [_model replaceTab:oldTab withTab:newTab];
 
       // Set isPrerenderTab to NO after replacing the tab. This will allow the
       // BrowserViewController to detect that a pre-rendered tab is switched in,
       // and show the prerendering animation.
       newTab.isPrerenderTab = NO;
 
       [self tabLoadComplete:newTab withSuccess:newTab.loadFinished];
@@ skipping 1418 matching lines @@
 
 - (UIView*)voiceSearchButton {
   return _voiceSearchButton;
 }
 
 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
   return [self currentLogoAnimationControllerOwner];
 }
 
 @end