Refactoring Reload in NavigationManager and CRWWebController.

ios/chrome/browser/tabs/tab.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/tabs/tab.h"
 
 #import <CoreLocation/CoreLocation.h>
 #import <UIKit/UIKit.h>
 
 #include <utility>
@@ skipping 1147 matching lines @@
       addLocationToNavigationItem:navigationItem
                      browserState:browserState_];
 }
 
 - (void)loadSessionTab:(const sessions::SessionTab*)sessionTab {
   DCHECK(sessionTab);
   [self replaceHistoryWithNavigations:sessionTab->navigations
                          currentIndex:sessionTab->current_navigation_index];
 }
 
-- (void)reload {
-  // TODO(crbug.com/661671): Convert callers to go through CRWWebController
-  // directly and remove this passthrough method.
-  [self.webController reload];
-}
-
 - (void)webWillReload {
   if ([parentTabModel_ tabUsageRecorder]) {
     [parentTabModel_ tabUsageRecorder]->RecordReload(self);
   }
 }
 
 // Stop the page loading.
 // Equivalent to the user pressing 'stop', or a window.stop() command.
 - (void)stopLoading {
   [self.webController stopLoading];
@@ skipping 274 matching lines @@
 - (void)countMainFrameLoad {
   if ([self isPrerenderTab] || [self url].SchemeIs(kChromeUIScheme)) {
     return;
   }
   base::RecordAction(UserMetricsAction("MobilePageLoaded"));
 }
 
 - (void)applicationDidBecomeActive {
   if (requireReloadAfterBecomingActive_) {
     if (visible_) {
-      [self.webController reload];
+      self.navigationManager->Reload(web::ReloadType::NORMAL,
+                                     true /* check_for_repost */);

[Eugene But (OOO till 7-30), 2017/03/15 17:53:32]

ditto

[liaoyuke, 2017/03/16 16:22:19]

Done.

     } else {
       [self.webController requirePageReload];
     }
     requireReloadAfterBecomingActive_ = NO;
   }
 }
 
 #pragma mark -
 #pragma mark FindInPageControllerDelegate
 
@@ skipping 518 matching lines @@
 
   BOOL applicationIsBackgrounded =
       [UIApplication sharedApplication].applicationState ==
       UIApplicationStateBackground;
   if (visible_) {
     if (!applicationIsBackgrounded) {
       base::WeakNSObject<Tab> weakSelf(self);
       base::scoped_nsobject<SadTabView> sadTabView(
           [[SadTabView alloc] initWithReloadHandler:^{
             base::scoped_nsobject<Tab> strongSelf([weakSelf retain]);
-            [strongSelf reload];
+            [strongSelf navigationManager]->Reload(web::ReloadType::NORMAL,

[Eugene But (OOO till 7-30), 2017/03/15 17:53:32]

ditto

[liaoyuke, 2017/03/16 16:22:19]

Done.

+                                                   true /* check_for_repost */);
           }]);
       base::scoped_nsobject<CRWContentView> contentView(
           [[CRWGenericContentView alloc] initWithView:sadTabView]);
       self.webState->ShowTransientContentView(contentView);
       [fullScreenController_ disableFullScreen];
     }
   } else {
     [self.webController requirePageReload];
   }
   // Returning to the app (after the renderer crashed in the background) and
@@ skipping 133 matching lines @@
 
 - (TabModel*)parentTabModel {
   return parentTabModel_;
 }
 
 - (FormInputAccessoryViewController*)inputAccessoryViewController {
   return inputAccessoryViewController_.get();
 }
 
 @end