Reversed WebState <-> CRWWebController ownership.

ios/web/web_state/web_state_impl.mm

Index: ios/web/web_state/web_state_impl.mm
diff --git a/ios/web/web_state/web_state_impl.mm b/ios/web/web_state/web_state_impl.mm
index 30a97938259149679f4fa7e55d68ade873312abf..c1137604cc92a35647cab7fd151f7a13f266ab57 100644
--- a/ios/web/web_state/web_state_impl.mm
+++ b/ios/web/web_state/web_state_impl.mm
@@ -24,6 +24,7 @@
 #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"
@@ -40,9 +41,12 @@ WebStateImpl::WebStateImpl(BrowserState* 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
@@ -93,9 +97,13 @@ 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 {