[ios] Moved WebLoadParams inside NavigationManager.

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 72 matching lines @@
 #include "ios/web/web_state/web_state_facade_delegate.h"
 #import "ios/web/web_state/web_state_impl.h"
 #import "net/base/mac/url_conversions.h"
 #include "net/base/net_errors.h"
 #import "ui/base/ios/cru_context_menu_holder.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
 using base::UserMetricsAction;
+using web::NavigationManager;
 using web::NavigationManagerImpl;
 using web::WebState;
 using web::WebStateImpl;
 
 namespace web {
 
 NSString* const kContainerViewID = @"Container View";
 const char* kWindowNameSeparator = "#";
 NSString* const kUserIsInteractingKey = @"userIsInteracting";
 NSString* const kOriginURLKey = @"originURL";
@@ skipping 1273 matching lines @@
   const web::Referrer referrer;
   // Unlike the WebView case, always create a new controller and view.
   // TODO(pinkerton): What to do if this does return nil?
   [self setNativeController:[_nativeProvider controllerForURL:targetURL]];
   [self registerLoadRequest:targetURL
                    referrer:referrer
                  transition:[self currentTransition]];
   [self loadNativeViewWithSuccess:YES];
 }
 
-- (void)loadWithParams:(const web::WebLoadParams&)originalParams {
+- (void)loadWithParams:(const NavigationManager::WebLoadParams&)originalParams {
   // Make a copy of |params|, as some of the delegate methods may modify it.
-  web::WebLoadParams params(originalParams);
+  NavigationManager::WebLoadParams params(originalParams);
 
   // Initiating a navigation from the UI, record the current page state before
   // the new page loads. Don't record for back/forward, as the current entry
   // has already been moved to the next entry in the history. Do, however,
   // record it for general reload.
   // TODO(jimblackler): consider a single unified call to record state whenever
   // the page is about to be changed. This cannot currently be done after
   // addPendingEntry is called.
 
   [_delegate webWillInitiateLoadWithParams:params];
@@ skipping 166 matching lines @@
   // implementation. This will be inaccurate if the reload fails or is
   // cancelled.
   _lastUserInteraction.reset();
   web::RecordAction(UserMetricsAction("Reload"));
   if (self.webView) {
     web::NavigationItem* transientItem =
         _webStateImpl->GetNavigationManagerImpl().GetTransientItem();
     if (transientItem) {
       // If there's a transient item, a reload is considered a new navigation to
       // the transient item's URL (as on other platforms).
-      web::WebLoadParams reloadParams(transientItem->GetURL());
+      NavigationManager::WebLoadParams reloadParams(transientItem->GetURL());
       reloadParams.transition_type = ui::PAGE_TRANSITION_RELOAD;
       reloadParams.extra_headers.reset(
           [transientItem->GetHttpRequestHeaders() copy]);
       [self loadWithParams:reloadParams];
     } else {
       // As with back and forward navigation, load the URL manually instead of
       // using the web view's reload. This ensures state processing and delegate
       // calls are consistent.
       // TODO(eugenebut): revisit this for WKWebView.
       [self loadCurrentURL];
@@ skipping 165 matching lines @@
           isPushStateNavigationBetweenEntry:fromEntry
                                    andEntry:self.currentSessionEntry];
   web::NavigationItemImpl* currentItem =
       self.currentSessionEntry.navigationItemImpl;
   GURL endURL = [self URLForHistoryNavigationFromItem:fromEntry.navigationItem
                                                toItem:currentItem];
   if (shouldLoadURL) {
     ui::PageTransition transition = ui::PageTransitionFromInt(
         ui::PAGE_TRANSITION_RELOAD | ui::PAGE_TRANSITION_FORWARD_BACK);
 
-    web::WebLoadParams params(endURL);
+    NavigationManager::WebLoadParams params(endURL);
     if (currentItem) {
       params.referrer = currentItem->GetReferrer();
     }
     params.transition_type = transition;
     [self loadWithParams:params];
   }
   // Set the serialized state if necessary.  State must be set if the document
   // objects are the same. This can happen if:
   // - The navigation is a pushState (i.e., shouldLoadURL is NO).
   // - The navigation is a hash change.
@@ skipping 2017 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