commit d616dc41cce6eadc244c8d7e0535dbce737116ab
author Justin Cohen <justincohen@google.com> Wed Jan 23 02:49:56 2019
committer Commit Bot <commit-bot@chromium.org> Wed Jan 23 02:49:56 2019
tree 430740fb4c4ff12892a3b17002df387c6d80ce0e
parent 0b29656a35f0ee4b059cf06b40af734920917735

Reland "[ios] Call LoadIfNecessary even when displaying the NTP."

This reverts commit 2a974e5ae5d7df2535b2923999f48a075d5394a8.

WKBasedNavigationManagerImpl::Restore will never actually begin loading
if the current page is an NTP.  Call LoadIfNecessary to begin restore
process.

Updated to more narrowly scope -LoadIfNecessary for NTP..

Change-Id: Ic1906bbab280d46e9b0766517eff718728b26933
Reviewed-on: https://chromium-review.googlesource.com/c/1427042
Auto-Submit: Justin Cohen <justincohen@chromium.org>
Reviewed-by: Danyao Wang <danyao@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625047}

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 0c76470..59933f3 100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -2366,6 +2366,10 @@
       UIViewController* viewController =
           _ntpCoordinatorsForWebStates[tab.webState].viewController;
       viewController.view.frame = [self ntpFrameForWebState:tab.webState];
+      // TODO(crbug.com/873729): For a newly created WebState, the session will
+      // not be restored until LoadIfNecessary call. Remove when fixed.
+      if (tab.webState->GetNavigationManager()->IsRestoreSessionInProgress())
+        tab.webState->GetNavigationManager()->LoadIfNecessary();
       self.browserContainerViewController.contentViewController =
           viewController;
     } else {