Remove CRWSessionController usage from BrowserViewController.

ios/chrome/browser/ui/browser_view_controller.mm

Index: ios/chrome/browser/ui/browser_view_controller.mm
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
index 2399ec4cf52459acd988c18e71e16ab8a7cf54a2..d8e7c6fdc027b993fbcc5a062c00625c1570ff95 100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -171,7 +171,6 @@
 #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"
@@ -3400,12 +3399,12 @@ - (void)showTabHistoryPopupForBackwardHistory {
   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 {
@@ -3417,12 +3416,12 @@ - (void)showTabHistoryPopupForForwardHistory {
   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 {
@@ -3616,13 +3615,11 @@ - (void)loadURL:(const GURL&)url
     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];