[ios] Switched web shell to use WebState for view and navigation.

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>
 
@@ skipping 22 matching lines @@
 NSString* const kWebShellAddressFieldAccessibilityLabel = @"Address field";
 
 @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;
 @end
 
 @implementation ViewController
 
 @synthesize field = _field;
 @synthesize containerView = _containerView;
 @synthesize toolbarView = _toolbarView;
 
 - (instancetype)initWithBrowserState:(web::BrowserState*)browserState {
@@ skipping 58 matching lines @@
   // Set up the network stack before creating the WebState.
   [self setUpNetworkStack];
 
   scoped_ptr<web::WebStateImpl> webState(new web::WebStateImpl(_browserState));
   webState->GetNavigationManagerImpl().InitializeSession(nil, nil, NO, 0);
   _webController.reset(web::CreateWebController(std::move(webState)));
   [_webController setDelegate:self];
   [_webController setUIDelegate:self];
   [_webController setWebUsageEnabled:YES];
 
-  [[_webController view] setFrame:[_containerView bounds]];
-  [_containerView addSubview:[_webController view]];
+  UIView* view = self.webState->GetView();
+  [view setFrame:[_containerView bounds]];
+  [_containerView addSubview:view];
 
   web::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.
   [NSURLCache setSharedURLCache:[EmptyNSURLCache emptyNSURLCache]];
 
   _httpProtocolDelegate.reset(new web::WebHTTPProtocolHandlerDelegate(
       _browserState->GetRequestContext()));
   net::HTTPProtocolHandlerDelegate::SetInstance(_httpProtocolDelegate.get());
   BOOL success = [NSURLProtocol registerClass:[CRNHTTPProtocolHandler class]];
   DCHECK(success);
   // The CRWURLVerifyingProtocolHandler is used to verify URL in the
@@ skipping 13 matching lines @@
 }
 
 - (UIBarPosition)positionForBar:(id<UIBarPositioning>)bar {
   if (bar == _toolbarView) {
     return UIBarPositionTopAttached;
   }
   return UIBarPositionAny;
 }
 
 - (void)back {
-  if ([_webController canGoBack]) {
-    [_webController goBack];
+  web::NavigationManager* navManager = self.webState->GetNavigationManager();
+  if (navManager->CanGoBack()) {
+    navManager->GoBack();
   }
 }
 
 - (void)forward {
-  if ([_webController canGoForward]) {
-    [_webController goForward];
+  web::NavigationManager* navManager = self.webState->GetNavigationManager();
+  if (navManager->CanGoForward()) {
+    navManager->GoForward();
   }
 }
 
 - (BOOL)textFieldShouldReturn:(UITextField*)field {
   GURL url = GURL(base::SysNSStringToUTF8([field text]));
 
   // Do not try to load invalid URLs.
   if (url.is_valid()) {
     web::WebLoadParams params(url);
     params.transition_type = ui::PAGE_TRANSITION_TYPED;
     [_webController loadWithParams:params];
   }
 
   [field resignFirstResponder];
   [self updateToolbar];
   return YES;
 }
 
 - (void)updateToolbar {
   // Do not update the URL if the text field is currently being edited.
   if ([_field isFirstResponder]) {
     return;
   }
 
-  const GURL& url = [_webController webStateImpl]->GetVisibleURL();
-  [_field setText:base::SysUTF8ToNSString(url.spec())];
+  const GURL& visibleURL = self.webState->GetVisibleURL();
+  [_field setText:base::SysUTF8ToNSString(visibleURL.spec())];
 }
 
 // -----------------------------------------------------------------------
 #pragma mark Bikeshedding Implementation
 
 // Overridden to allow this view controller to receive motion events by being
 // first responder when no other views are.
 - (BOOL)canBecomeFirstResponder {
   return YES;
 }
@@ skipping 144 matching lines @@
     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