Reload offline version on load failure

ios/web/web_state/ui/crw_web_controller.mm

Index: ios/web/web_state/ui/crw_web_controller.mm
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index ca23114424b25110cd961183512fc18ee9f53b60..dec19d9ce7b98093dba8c10749595bdf10cdc022 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -2029,6 +2029,9 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
   // addPendingEntry is called.
 
   [_delegate webWillInitiateLoadWithParams:params];
+  if ([self.nativeController respondsToSelector:@selector(willBeDismissed)]) {
+    [self.nativeController willBeDismissed];

[Eugene But (OOO till 7-30), 2016/12/19 17:52:32]

There are probably other cases when this needs to be called. Possibly
|goToItemAtIndex:|, and places where |clearTransientContentView| is called.

[Olivier, 2016/12/19 18:26:38]

Done.

+  }
 
   GURL navUrl = params.url;
   ui::PageTransition transition = params.transition_type;
@@ -4052,7 +4055,7 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
   // delination that would allow changing to one of the non-deprecated URL
   // calls.
   web::NavigationItem* item = [self currentNavItem];
-  return item ? item->GetVirtualURL() : GURL::EmptyGURL();
+  return item ? item->GetURL() : GURL::EmptyGURL();
 }
 
 - (ui::PageTransition)currentTransition {