Remove RequestTracker from WebStateImpl.

ios/web/web_state/ui/crw_web_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/web/web_state/ui/crw_web_controller.h"
 
 #import <WebKit/WebKit.h>
 
 #import <objc/runtime.h>
 #include <stddef.h>
@@ skipping 31 matching lines @@
 #include "ios/web/history_state_util.h"
 #import "ios/web/interstitials/web_interstitial_impl.h"
 #import "ios/web/navigation/crw_session_certificate_policy_manager.h"
 #import "ios/web/navigation/crw_session_controller.h"
 #import "ios/web/navigation/crw_session_entry.h"
 #import "ios/web/navigation/navigation_item_impl.h"
 #import "ios/web/navigation/navigation_manager_impl.h"
 #include "ios/web/net/cert_host_pair.h"
 #import "ios/web/net/crw_cert_verification_controller.h"
 #import "ios/web/net/crw_ssl_status_updater.h"
 #import "ios/web/net/request_group_util.h"

[Eugene But (OOO till 7-30), 2017/01/19 19:05:54]

nit: Do we still need this include?

[sdefresne, 2017/01/20 11:31:27]

Removed.

 #include "ios/web/public/browser_state.h"
 #include "ios/web/public/favicon_url.h"
 #import "ios/web/public/java_script_dialog_presenter.h"
 #import "ios/web/public/navigation_item.h"
 #import "ios/web/public/navigation_manager.h"
 #import "ios/web/public/origin_util.h"
 #include "ios/web/public/referrer.h"
 #include "ios/web/public/referrer_util.h"
 #include "ios/web/public/ssl_status.h"
 #import "ios/web/public/url_scheme_util.h"
@@ skipping 924 matching lines @@
 @synthesize webUsageEnabled = _webUsageEnabled;
 @synthesize usePlaceholderOverlay = _usePlaceholderOverlay;
 @synthesize loadPhase = _loadPhase;
 @synthesize shouldSuppressDialogs = _shouldSuppressDialogs;
 
 - (instancetype)initWithWebState:(WebStateImpl*)webState {
   self = [super init];
   if (self) {
     _webStateImpl = webState;
     DCHECK(_webStateImpl);
-    _webStateImpl->InitializeRequestTracker(self);
     // Load phase when no WebView present is 'loaded' because this represents
     // the idle state.
     _loadPhase = web::PAGE_LOADED;
     // Content area is lazily instantiated.
     _defaultURL = GURL(url::kAboutBlankURL);
     _jsInjectionReceiver.reset(
         [[CRWJSInjectionReceiver alloc] initWithEvaluator:self]);
     _webViewProxy.reset(
         [[CRWWebViewProxyImpl alloc] initWithWebController:self]);
     [[_webViewProxy scrollViewProxy] addObserver:self];
@@ skipping 211 matching lines @@
 
 // Stop doing stuff, especially network stuff. Close the request tracker.
 - (void)terminateNetworkActivity {
   DCHECK(!_isHalted);
   _isHalted = YES;
 
   // Cancel all outstanding perform requests, and clear anything already queued
   // (since this may be called from within the handling loop) to prevent any
   // asynchronous JavaScript invocation handling from continuing.
   [NSObject cancelPreviousPerformRequestsWithTarget:self];
-  _webStateImpl->CloseRequestTracker();
 }
 
 - (void)dismissModals {
   if ([self.nativeController respondsToSelector:@selector(dismissModals)])
     [self.nativeController dismissModals];
 }
 
 // Caller must reset the delegate before calling.
 - (void)close {
   _webStateImpl->CancelDialogs();
@@ skipping 910 matching lines @@
         _webStateImpl->SetIsLoading(false);
       }
       [_delegate webCancelStartLoadingRequest];
       break;
     case web::PAGE_LOADING:
       // The previous load never fully completed before this page change. The
       // loadPhase is changed to PAGE_LOADED to indicate the cycle is complete,
       // and the delegate is called.
       _loadPhase = web::PAGE_LOADED;
       if (!_isHalted) {
-        // RequestTracker expects StartPageLoad to be followed by
-        // FinishPageLoad, passing the exact same URL.
-        self.webStateImpl->GetRequestTracker()->FinishPageLoad(
-            _URLOnStartLoading, false);
         _webStateImpl->SetIsLoading(false);
       }
       [_delegate webLoadCancelled:_URLOnStartLoading];
       break;
     case web::PAGE_LOADED:
       break;
   }
 }
 
 - (void)goToItemAtIndex:(int)index {
@@ skipping 91 matching lines @@
 
   // Execute the pending LoadCompleteActions.
   for (ProceduralBlock action in _pendingLoadCompleteActions.get()) {
     action();
   }
   [_pendingLoadCompleteActions removeAllObjects];
 }
 
 - (void)didFinishWithURL:(const GURL&)currentURL loadSuccess:(BOOL)loadSuccess {
   DCHECK(_loadPhase == web::PAGE_LOADED);
-  _webStateImpl->GetRequestTracker()->FinishPageLoad(currentURL, loadSuccess);
-
   // Rather than creating a new WKBackForwardListItem when loading WebUI pages,
   // WKWebView will cache the WebUI HTML in the previous WKBackForwardListItem
   // since it's loaded via |-loadHTML:forURL:| instead of an NSURLRequest.  As a
   // result, the WebUI's HTML and URL will be loaded when navigating to that
   // WKBackForwardListItem, causing a mismatch between the visible content and
   // the visible URL (WebUI page will be visible, but URL will be the previous
   // page's URL).  To prevent this potential URL spoofing vulnerability, reset
   // the previous NavigationItem's WKBackForwardListItem to force loading via
   // NSURLRequest.
   if (_webUIManager) {
@@ skipping 863 matching lines @@
 
 - (void)didStartLoadingURL:(const GURL&)url updateHistory:(BOOL)updateHistory {
   _loadPhase = web::PAGE_LOADING;
   _URLOnStartLoading = url;
   _displayStateOnStartLoading = self.pageDisplayState;
 
   self.userInteractionRegistered = NO;
   _pageHasZoomed = NO;
 
   [[self sessionController] commitPendingEntry];
-  _webStateImpl->GetRequestTracker()->StartPageLoad(
-      url, [[self sessionController] currentEntry]);
   [_delegate webDidStartLoadingURL:url shouldUpdateHistory:updateHistory];
 }
 
 - (void)wasShown {
   if ([self.nativeController respondsToSelector:@selector(wasShown)]) {
     [self.nativeController wasShown];
   }
 }
 
 - (void)wasHidden {
@@ skipping 1110 matching lines @@
                                    linkClicked:linkActivatedNavigation];
 }
 
 - (CGFloat)headerHeight {
   if (![_delegate respondsToSelector:@selector(headerHeightForWebController:)])
     return 0.0f;
   return [_delegate headerHeightForWebController:self];
 }
 
 - (void)didUpdateHistoryStateWithPageURL:(const GURL&)url {
-  _webStateImpl->GetRequestTracker()->HistoryStateChange(url);
   [_delegate webDidUpdateHistoryStateWithPageURL:url];
 }
 
 - (void)updateSSLStatusForCurrentNavigationItem {
   if (_isBeingDestroyed) {
     return;
   }
 
   web::NavigationManager* navManager = self.webState->GetNavigationManager();
   web::NavigationItem* currentNavItem = navManager->GetLastCommittedItem();
@@ skipping 1211 matching lines @@
   }
 
   return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC;
 }
 
 - (NSString*)refererFromNavigationAction:(WKNavigationAction*)action {
   return [action.request valueForHTTPHeaderField:@"Referer"];
 }
 
 @end