Reversed WebState <-> CRWWebController ownership.

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 <memory>
 #include <utility>
 
 #include "base/mac/objc_property_releaser.h"
 #import "base/mac/scoped_nsobject.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"
 #include "ios/web/public/referrer.h"
-#import "ios/web/public/web_controller_factory.h"
 #include "ios/web/public/web_state/web_state.h"
 #import "ios/web/public/web_state/web_state_observer_bridge.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 ()<CRWWebStateObserver> {
   web::BrowserState* _browserState;
-  base::scoped_nsobject<CRWWebController> _webController;
+  std::unique_ptr<web::WebStateImpl> _webState;
   std::unique_ptr<web::WebStateObserverBridge> _webStateObserver;
 
   base::mac::ObjCPropertyReleaser _propertyReleaser_ViewController;
 }
-@property(nonatomic, assign, readonly) web::WebState* webState;
 @property(nonatomic, assign, readonly) NavigationManager* navigationManager;
 @property(nonatomic, readwrite, retain) UITextField* field;
 @end
 
 @implementation ViewController
 
 @synthesize field = _field;
 @synthesize containerView = _containerView;
 @synthesize toolbarView = _toolbarView;
 
@@ skipping 52 matching lines @@
   [field setClearButtonMode:UITextFieldViewModeWhileEditing];
   self.field = field;
 
   [_toolbarView addSubview:back];
   [_toolbarView addSubview:forward];
   [_toolbarView addSubview:field];
 
   // Set up the network stack before creating the WebState.
   [self setUpNetworkStack];
 
-  std::unique_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 setWebUsageEnabled:YES];
+  _webState.reset(new web::WebStateImpl(_browserState));
+  _webState->GetNavigationManagerImpl().InitializeSession(nil, nil, NO, 0);
+  [_webState->GetWebController() setDelegate:self];
+  [_webState->GetWebController() setWebUsageEnabled:YES];
 
-  _webStateObserver.reset(new web::WebStateObserverBridge(self.webState, self));
+  _webStateObserver.reset(
+      new web::WebStateObserverBridge(_webState.get(), self));
 
-  UIView* view = self.webState->GetView();
+  UIView* view = _webState->GetView();
   [view setFrame:[_containerView bounds]];
   [_containerView addSubview:view];
 
   NavigationManager::WebLoadParams params(GURL("https://dev.chromium.org/"));
   params.transition_type = ui::PAGE_TRANSITION_TYPED;
   self.navigationManager->LoadURLWithParams(params);
 }
 
-- (web::WebState*)webState {
-  return [_webController webState];
-}
-
 - (NavigationManager*)navigationManager {
-  return self.webState->GetNavigationManager();
+  return _webState->GetNavigationManager();
 }
 
 - (void)setUpNetworkStack {
   // Disable the default cache.
   [NSURLCache setSharedURLCache:[EmptyNSURLCache emptyNSURLCache]];
   net::CookieStoreIOS::SetCookiePolicy(net::CookieStoreIOS::ALLOW);
 }
 
 - (void)didReceiveMemoryWarning {
   [super didReceiveMemoryWarning];
@@ skipping 32 matching lines @@
   [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& visibleURL = self.webState->GetVisibleURL();
+  const GURL& visibleURL = _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 50 matching lines @@
 - (void)didStartProvisionalNavigationForURL:(const GURL&)URL {
   [self updateToolbar];
 }
 
 - (void)didCommitNavigationWithDetails:
     (const web::LoadCommittedDetails&)details {
   [self updateToolbar];
 }
 
 - (void)webStateDidLoadPage:(web::WebState*)webState {
-  DCHECK_EQ(self.webState, webState);
+  DCHECK_EQ(_webState.get(), webState);
   [self updateToolbar];
 }
 
 // -----------------------------------------------------------------------
 // WebDelegate implementation.
 
 - (void)webWillAddPendingURL:(const GURL&)url
                   transition:(ui::PageTransition)transition {
 }
 - (void)webDidAddPendingURL {
@@ skipping 77 matching lines @@
 - (void)webWillFinishHistoryNavigationFromEntry:(CRWSessionEntry*)fromEntry {
 }
 - (int)downloadImageAtUrl:(const GURL&)url
             maxBitmapSize:(uint32_t)maxBitmapSize
                  callback:
                      (const web::WebState::ImageDownloadCallback&)callback {
   return -1;
 }
 
 @end