Refactoring Reload in NavigationManager and CRWWebController.

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 2867 matching lines @@
 
 - (void)overscrollActionsController:(OverscrollActionsController*)controller
                    didTriggerAction:(OverscrollAction)action {
   switch (action) {
     case OverscrollAction::NEW_TAB:
       [self newTab:nil];
       break;
     case OverscrollAction::CLOSE_TAB:
       [self closeCurrentTab];
       break;
-    case OverscrollAction::REFRESH:
+    case OverscrollAction::REFRESH: {
       if ([[[_model currentTab] webController] loadPhase] ==
           web::PAGE_LOADING) {
         [[_model currentTab] stopLoading];
       }
-      [[_model currentTab] reload];
+
+      web::WebState* webState = [_model currentTab].webState;
+      if (webState)
+        webState->GetNavigationManager()->Reload(web::ReloadType::NORMAL,
+                                                 true /* check_for_repost */);
       break;
+    }
     case OverscrollAction::NONE:
       NOTREACHED();
       break;
   }
 }
 
 - (BOOL)shouldAllowOverscrollActions {
   return YES;
 }
 
@@ skipping 930 matching lines @@
           return;
         [_typingShield setHidden:YES];
       }];
   [[OmniboxGeolocationController sharedInstance]
       locationBarDidResignFirstResponder:_browserState];
 
   // If a load was cancelled by an omnibox edit, but nothing is loading when
   // editing ends (i.e., editing was cancelled), restart the cancelled load.
   if (_locationBarEditCancelledLoad) {
     _locationBarEditCancelledLoad = NO;
-    if (!_toolbarModelIOS->IsLoading()) {
-      [[_model currentTab] reload];
-    }
+
+    web::WebState* webState = [_model currentTab].webState;
+    if (!_toolbarModelIOS->IsLoading() && webState)
+      webState->GetNavigationManager()->Reload(web::ReloadType::NORMAL,
+                                               true /* check_for_repost */);
   }
 }
 
 - (IBAction)locationBarBeganEdit:(id)sender {
   // On handsets, if a page is currently loading it should be stopped.
   if (!IsIPadIdiom() && _toolbarModelIOS->IsLoading()) {
     base::scoped_nsobject<GenericChromeCommand> command(
         [[GenericChromeCommand alloc] initWithTag:IDC_STOP]);
     [self chromeExecuteCommand:command];
     _locationBarEditCancelledLoad = YES;
@@ skipping 121 matching lines @@
       _voiceSearchController->PrepareToAppear();
       break;
     case IDC_NEW_INCOGNITO_TAB:
       if (_isOffTheRecord) {
         [self newTab:sender];
       } else {
         // Not for this browser state, send it on its way.
         [super chromeExecuteCommand:sender];
       }
       break;
-    case IDC_RELOAD:
-      [[_model currentTab] reload];
+    case IDC_RELOAD: {
+      web::WebState* webState = [_model currentTab].webState;
+      if (webState)
+        webState->GetNavigationManager()->Reload(web::ReloadType::NORMAL,
+                                                 true /* check_for_repost */);
       break;
+    }
     case IDC_SHARE_PAGE:
       [self sharePage];
       break;
     case IDC_SHOW_MAIL_COMPOSER:
       [self showMailComposer:sender];
       break;
     case IDC_READER_MODE:
       [[_model currentTab] switchToReaderMode];
       break;
     case IDC_REQUEST_DESKTOP_SITE:
@@ skipping 1099 matching lines @@
 
 - (UIView*)voiceSearchButton {
   return _voiceSearchButton;
 }
 
 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
   return [self currentLogoAnimationControllerOwner];
 }
 
 @end