[ios] Moved WebLoadParams inside NavigationManager.

ios/web/shell/view_controller.mm

 // Copyright 2014 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/shell/view_controller.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/mac/objc_property_releaser.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/sys_string_conversions.h"
 #include "ios/net/cookies/cookie_store_ios.h"
 #import "ios/net/crn_http_protocol_handler.h"
 #import "ios/net/empty_nsurlcache.h"
 #import "ios/web/navigation/crw_session_controller.h"
-#include "ios/web/navigation/web_load_params.h"
 #import "ios/web/net/crw_url_verifying_protocol_handler.h"
 #include "ios/web/net/request_tracker_factory_impl.h"
 #import "ios/web/net/web_http_protocol_handler_delegate.h"
 #include "ios/web/public/referrer.h"
 #import "ios/web/public/web_controller_factory.h"
 #include "ios/web/public/web_state/web_state.h"
 #include "ios/web/shell/shell_browser_state.h"
 #include "ios/web/web_state/ui/crw_web_controller.h"
 #include "ios/web/web_state/web_state_impl.h"
 #include "ui/base/page_transition_types.h"
 
 NSString* const kWebShellBackButtonAccessibilityLabel = @"Back";
 NSString* const kWebShellForwardButtonAccessibilityLabel = @"Forward";
 NSString* const kWebShellAddressFieldAccessibilityLabel = @"Address field";
 
+using web::NavigationManager;
+
 @interface ViewController ()<CRWWebUserInterfaceDelegate> {
   web::BrowserState* _browserState;
   base::scoped_nsobject<CRWWebController> _webController;
   scoped_ptr<web::RequestTrackerFactoryImpl> _requestTrackerFactory;
   scoped_ptr<web::WebHTTPProtocolHandlerDelegate> _httpProtocolDelegate;
 
   base::mac::ObjCPropertyReleaser _propertyReleaser_ViewController;
 }
 @property(nonatomic, assign, readonly) web::WebState* webState;
 @property(nonatomic, readwrite, retain) UITextField* field;
@@ skipping 71 matching lines @@
   webState->GetNavigationManagerImpl().InitializeSession(nil, nil, NO, 0);
   _webController.reset(web::CreateWebController(std::move(webState)));
   [_webController setDelegate:self];
   [_webController setUIDelegate:self];
   [_webController setWebUsageEnabled:YES];
 
   UIView* view = self.webState->GetView();
   [view setFrame:[_containerView bounds]];
   [_containerView addSubview:view];
 
-  web::WebLoadParams params(GURL("https://dev.chromium.org/"));
+  NavigationManager::WebLoadParams params(GURL("https://dev.chromium.org/"));
   params.transition_type = ui::PAGE_TRANSITION_TYPED;
   [_webController loadWithParams:params];
 }
 
 - (web::WebState*)webState {
   return [_webController webState];
 }
 
 - (void)setUpNetworkStack {
   // Disable the default cache.
@@ skipping 21 matching lines @@
 }
 
 - (UIBarPosition)positionForBar:(id<UIBarPositioning>)bar {
   if (bar == _toolbarView) {
     return UIBarPositionTopAttached;
   }
   return UIBarPositionAny;
 }
 
 - (void)back {
-  web::NavigationManager* navManager = self.webState->GetNavigationManager();
+  NavigationManager* navManager = self.webState->GetNavigationManager();
   if (navManager->CanGoBack()) {
     navManager->GoBack();
   }
 }
 
 - (void)forward {
-  web::NavigationManager* navManager = self.webState->GetNavigationManager();
+  NavigationManager* navManager = self.webState->GetNavigationManager();
   if (navManager->CanGoForward()) {
     navManager->GoForward();
   }
 }
 
 - (BOOL)textFieldShouldReturn:(UITextField*)field {
-  GURL url = GURL(base::SysNSStringToUTF8([field text]));
+  GURL URL = GURL(base::SysNSStringToUTF8([field text]));
 
   // Do not try to load invalid URLs.
-  if (url.is_valid()) {
-    web::WebLoadParams params(url);
+  if (URL.is_valid()) {
+    NavigationManager::WebLoadParams params(URL);
     params.transition_type = ui::PAGE_TRANSITION_TYPED;
     [_webController loadWithParams:params];
   }
 
   [field resignFirstResponder];
   [self updateToolbar];
   return YES;
 }
 
 - (void)updateToolbar {
@@ skipping 133 matching lines @@
 - (void)webController:(CRWWebController*)webController
     retrievePlaceholderOverlayImage:(void (^)(UIImage*))block {
 }
 - (void)webController:(CRWWebController*)webController
     onFormResubmissionForRequest:(NSURLRequest*)request
                    continueBlock:(ProceduralBlock)continueBlock
                      cancelBlock:(ProceduralBlock)cancelBlock {
 }
 - (void)webWillReload {
 }
-- (void)webWillInitiateLoadWithParams:(web::WebLoadParams&)params {
+- (void)webWillInitiateLoadWithParams:
+    (NavigationManager::WebLoadParams&)params {
 }
-- (void)webDidUpdateSessionForLoadWithParams:(const web::WebLoadParams&)params
+- (void)webDidUpdateSessionForLoadWithParams:
+            (const NavigationManager::WebLoadParams&)params
                         wasInitialNavigation:(BOOL)initialNavigation {
 }
 - (void)webWillFinishHistoryNavigationFromEntry:(CRWSessionEntry*)fromEntry {
 }
 - (int)downloadImageAtUrl:(const GURL&)url
             maxBitmapSize:(uint32_t)maxBitmapSize
                  callback:
                      (const web::WebState::ImageDownloadCallback&)callback {
   return -1;
 }
 
 // -----------------------------------------------------------------------
 // CRWWebUserInterfaceDelegate implementation.
 
 - (void)webController:(CRWWebController*)webController
     runAuthDialogForProtectionSpace:(NSURLProtectionSpace*)protectionSpace
                  proposedCredential:(NSURLCredential*)credential
                   completionHandler:
                       (void (^)(NSString* user, NSString* password))handler {
   // Calling |handler| with nil objects is the same as not implemeting it. This
   // method is implemented to make testing easier.
   handler(nil, nil);
 }
 
 @end