Reversed WebState <-> CRWWebController ownership.

ios/web/web_state/web_state_impl.mm

 // Copyright 2013 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.
 
 #include "ios/web/web_state/web_state_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/strings/sys_string_conversions.h"
 #include "ios/web/interstitials/web_interstitial_impl.h"
 #import "ios/web/navigation/crw_session_controller.h"
 #import "ios/web/navigation/crw_session_entry.h"
 #include "ios/web/navigation/navigation_item_impl.h"
 #include "ios/web/net/request_group_util.h"
 #include "ios/web/public/browser_state.h"
 #include "ios/web/public/navigation_item.h"
 #include "ios/web/public/url_util.h"
 #include "ios/web/public/web_client.h"
 #include "ios/web/public/web_state/credential.h"
 #include "ios/web/public/web_state/ui/crw_content_view.h"
 #include "ios/web/public/web_state/web_state_observer.h"
 #include "ios/web/public/web_state/web_state_policy_decider.h"
 #include "ios/web/web_state/global_web_state_event_tracker.h"
 #import "ios/web/web_state/ui/crw_web_controller.h"
 #import "ios/web/web_state/ui/crw_web_controller_container_view.h"
+#import "ios/web/web_state/ui/crw_wk_web_view_web_controller.h"
 #include "ios/web/web_state/web_state_facade_delegate.h"
 #import "ios/web/webui/web_ui_ios_controller_factory_registry.h"
 #import "ios/web/webui/web_ui_ios_impl.h"
 #include "net/http/http_response_headers.h"
 
 namespace web {
 
 WebStateImpl::WebStateImpl(BrowserState* browser_state)
     : is_loading_(false),
       is_being_destroyed_(false),
       facade_delegate_(nullptr),
       web_controller_(nil),
       navigation_manager_(this, browser_state),
       interstitial_(nullptr),
       weak_factory_(this) {
   GlobalWebStateEventTracker::GetInstance()->OnWebStateCreated(this);
+  web_controller_.reset(
+      [[CRWWKWebViewWebController alloc] initWithWebState:this]);
 }
 
 WebStateImpl::~WebStateImpl() {
+  [web_controller_ close];
   is_being_destroyed_ = true;
 
   // WebUI depends on web state so it must be destroyed first in case any WebUI
   // implementations depends on accessing web state during destruction.
   ClearWebUI();
 
   // The facade layer (owned by the delegate) should be destroyed before the web
   // layer.
   DCHECK(!facade_delegate_);
 
@@ skipping 30 matching lines @@
   // deciders. This makes the call here odd looking, but it's really just
   // managing the list, not setting observers on deciders.
   DCHECK(policy_deciders_.HasObserver(decider));
   policy_deciders_.RemoveObserver(decider);
 }
 
 bool WebStateImpl::Configured() const {
   return web_controller_ != nil;
 }
 
+CRWWebController* WebStateImpl::GetWebController() {
+  return web_controller_;
+}
+
 void WebStateImpl::SetWebController(CRWWebController* web_controller) {
-  DCHECK(!web_controller_);
-  web_controller_ = web_controller;
+  [web_controller_ close];

[kkhorimoto, 2016/04/12 21:36:13]

DCHECK_EQ(this, web_controller.webState)?  We might get into a bad state if this
is not the case.

[Eugene But (OOO till 7-30), 2016/04/13 02:51:26]

SetWebController is used only in unit tests and in all places web_controller is
mock and does not return webState. So this DCHECK will fail for every call. It
is possible to change the test and make mock return webState, but it will not
make the code more robust. The right direction would be removing
GetWebController and SetWebController once Embedder stop using WC.

+  web_controller_.reset([web_controller retain]);
 }
 
 WebStateFacadeDelegate* WebStateImpl::GetFacadeDelegate() const {
   return facade_delegate_;
 }
 
 void WebStateImpl::SetFacadeDelegate(WebStateFacadeDelegate* facade_delegate) {
   facade_delegate_ = facade_delegate;
 }
 
@@ skipping 453 matching lines @@
     const LoadCommittedDetails& load_details) {
   FOR_EACH_OBSERVER(WebStateObserver, observers_,
                     NavigationItemCommitted(load_details));
 }
 
 WebState* WebStateImpl::GetWebState() {
   return this;
 }
 
 }  // namespace web