[ios] Removed RequestTracker dependency from WebLoadParams.

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 <objc/runtime.h>
 #include <stddef.h>
 
 #include <cmath>
@@ skipping 1203 matching lines @@
 
   _loadPhase = web::LOAD_REQUESTED;
   [self resetLoadState];
   _lastRegisteredRequestURL = requestURL;
 
   if (!(transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK)) {
     // Record state of outgoing page.
     [self recordStateInHistory];
   }
 
-  // If the web view had been discarded, and this request is to load that
-  // URL again, then it's a rebuild and should use the cache.
-  BOOL preferCache = _expectedReconstructionURL.is_valid() &&
-                     _expectedReconstructionURL == requestURL;
-
   [_delegate webWillAddPendingURL:requestURL transition:transition];
   // Add or update pending url.
   if (_webStateImpl->GetNavigationManagerImpl().GetPendingItem()) {
     // Update the existing pending entry.
     // Typically on PAGE_TRANSITION_CLIENT_REDIRECT.
     [[self sessionController] updatePendingEntry:requestURL];
   } else {
     // A new session history entry needs to be created.
     [[self sessionController] addPendingEntry:requestURL
                                      referrer:referrer
                                    transition:transition
                             rendererInitiated:YES];
   }
-  // Update the cache mode for all the network requests issued by this web view.
-  // The mode is reset to CACHE_NORMAL after each page load.
-  if (_webStateImpl->GetCacheMode() != net::RequestTracker::CACHE_NORMAL) {
-    _webStateImpl->GetRequestTracker()->SetCacheModeFromUIThread(
-        _webStateImpl->GetCacheMode());
-  } else if (preferCache) {
-    _webStateImpl->GetRequestTracker()->SetCacheModeFromUIThread(
-        net::RequestTracker::CACHE_HISTORY);
-  }
   _webStateImpl->SetIsLoading(true);
   [_delegate webDidAddPendingURL];
   _webStateImpl->OnProvisionalNavigationStarted(requestURL);
 }
 
 - (NSString*)javascriptToReplaceWebViewURL:(const GURL&)URL
                            stateObjectJSON:(NSString*)stateObject {
   std::string outURL;
   base::EscapeJSONString(URL.spec(), true, &outURL);
   return
@@ skipping 187 matching lines @@
       DCHECK([addedItem->GetHttpRequestHeaders() objectForKey:@"Content-Type"])
           << "Post data should have an associated content type";
       addedItem->SetPostData(params.post_data);
       addedItem->SetShouldSkipResubmitDataConfirmation(true);
     }
   }
 
   [_delegate webDidUpdateSessionForLoadWithParams:params
                              wasInitialNavigation:initialNavigation];
 
-  // If a non-default cache mode is passed in, it takes precedence over
-  // |reload|.
-  const BOOL reload = [self shouldReload:navUrl transition:transition];
-  if (params.cache_mode != net::RequestTracker::CACHE_NORMAL) {
-    _webStateImpl->SetCacheMode(params.cache_mode);
-  } else if (reload) {
-    _webStateImpl->SetCacheMode(net::RequestTracker::CACHE_RELOAD);
-  }
-
   [self loadCurrentURL];
-
-  // Change the cache mode back to CACHE_NORMAL after a reload.
-  _webStateImpl->SetCacheMode(net::RequestTracker::CACHE_NORMAL);
 }
 
 - (void)loadCurrentURL {
   // If the content view doesn't exist, the tab has either been evicted, or
   // never displayed. Bail, and let the URL be loaded when the tab is shown.
   if (!self.containerView)
     return;
 
   // Reset current WebUI if one exists.
   [self clearWebUI];
@@ skipping 128 matching lines @@
       // TODO(eugenebut): revisit this for WKWebView.
       [self loadCurrentURL];
     }
   } else {
     [self.nativeController reload];
   }
 }
 
 - (void)reload {
   [_delegate webWillReload];
-
-  _webStateImpl->SetCacheMode(net::RequestTracker::CACHE_RELOAD);
   [self reloadInternal];
-  _webStateImpl->SetCacheMode(net::RequestTracker::CACHE_NORMAL);
 }
 
 - (void)loadCancelled {
   // Current load will not complete; this should be communicated upstream to the
   // delegate.
   switch (_loadPhase) {
     case web::LOAD_REQUESTED:
       // Load phase after abort is always PAGE_LOADED.
       _loadPhase = web::PAGE_LOADED;
       if (!_isHalted) {
@@ skipping 69 matching lines @@
   }
 
   CRWSessionController* sessionController =
       _webStateImpl->GetNavigationManagerImpl().GetSessionController();
   // fromEntry is retained because it has the potential to be released
   // by goDelta: if it has not been committed.
   base::scoped_nsobject<CRWSessionEntry> fromEntry(
       [[sessionController currentEntry] retain]);
   [sessionController goDelta:delta];
   if (fromEntry) {
-    _webStateImpl->SetCacheMode(net::RequestTracker::CACHE_HISTORY);
     [self finishHistoryNavigationFromEntry:fromEntry];
-    _webStateImpl->SetCacheMode(net::RequestTracker::CACHE_NORMAL);
   }
 }
 
 - (BOOL)isLoaded {
   return _loadPhase == web::PAGE_LOADED;
 }
 
 - (void)loadCompleteWithSuccess:(BOOL)loadSuccess {
   [self removePlaceholderOverlay];
   // The webView may have been torn down (or replaced by a native view). Be
@@ skipping 28 matching lines @@
 
 - (void)didFinishWithURL:(const GURL&)currentURL loadSuccess:(BOOL)loadSuccess {
   DCHECK(_loadPhase == web::PAGE_LOADED);
   _webStateImpl->GetRequestTracker()->FinishPageLoad(currentURL, loadSuccess);
   // Reset the navigation type to the default value.
   // Note: it is possible that the web view has already started loading the
   // next page when this is called. In that case the cache mode can leak to
   // (some of) the requests of the next page. It's expected to be an edge case,
   // but if it becomes a problem it should be possible to notice it afterwards
   // and react to it (by warning the user or reloading the page for example).
-  _webStateImpl->SetCacheMode(net::RequestTracker::CACHE_NORMAL);
   _webStateImpl->GetRequestTracker()->SetCacheModeFromUIThread(
-      _webStateImpl->GetCacheMode());
+      net::RequestTracker::CACHE_NORMAL);
 
   [self restoreStateFromHistory];
   [self loadCompletedForURL:currentURL];
   _webStateImpl->OnPageLoaded(currentURL, loadSuccess);
   _webStateImpl->SetIsLoading(false);
   // Inform the embedder the load completed.
   [_delegate webDidFinishWithURL:currentURL loadSuccess:loadSuccess];
 }
 
 - (void)finishHistoryNavigationFromEntry:(CRWSessionEntry*)fromEntry {
@@ skipping 2046 matching lines @@
   if ([MIMEType isEqualToString:@"text/html"] ||
       [MIMEType isEqualToString:@"application/xhtml+xml"] ||
       [MIMEType isEqualToString:@"application/xml"]) {
     return web::WEB_VIEW_DOCUMENT_TYPE_HTML;
   }
 
   return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC;
 }
 
 @end