Reversed WebState <-> CRWWebController ownership.

ios/web/test/web_test.mm

 // Copyright 2012 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/test/web_test.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/memory/ptr_util.h"
@@ skipping 50 matching lines @@
 #pragma mark -
 
 WebTestWithWebController::WebTestWithWebController() {}
 
 WebTestWithWebController::~WebTestWithWebController() {}
 
 static int s_html_load_count;
 
 void WebTestWithWebController::SetUp() {
   WebTest::SetUp();
-  webController_.reset(this->CreateWebController());
+  web_state_impl_.reset(new WebStateImpl(GetBrowserState()));
+  web_state_impl_->GetNavigationManagerImpl().InitializeSession(nil, nil, NO,
+                                                                0);
+  webController_.reset(web_state_impl_->GetWebController());
 
   [webController_ setWebUsageEnabled:YES];
   // Force generation of child views; necessary for some tests.
   [webController_ triggerPendingLoad];
   s_html_load_count = 0;
 }
 
 void WebTestWithWebController::TearDown() {
-  [webController_ close];
+  web_state_impl_.reset();
   WebTest::TearDown();
 }
 
 void WebTestWithWebController::LoadHtml(NSString* html) {
   LoadHtml([html UTF8String]);
 }
 
 void WebTestWithWebController::LoadHtml(const std::string& html) {
   NSString* load_check = CreateLoadCheck();
   std::string marked_html = html + [load_check UTF8String];
@@ skipping 78 matching lines @@
                  stringResultHandler:^(NSString* result, NSError*) {
                    DCHECK([result isKindOfClass:[NSString class]]);
                    evaluationResult.reset([result copy]);
                  }];
   base::test::ios::WaitUntilCondition(^bool() {
     return evaluationResult;
   });
   return [[evaluationResult retain] autorelease];
 }
 
-CRWWebController* WebTestWithWebController::CreateWebController() {
-  std::unique_ptr<WebStateImpl> web_state_impl(
-      new WebStateImpl(GetBrowserState()));
-  return [[CRWWKWebViewWebController alloc]
-      initWithWebState:std::move(web_state_impl)];
-}
-
 void WebTestWithWebController::WillProcessTask(
     const base::PendingTask& pending_task) {
   // Nothing to do.
 }
 
 void WebTestWithWebController::DidProcessTask(
     const base::PendingTask& pending_task) {
   processed_a_task_ = true;
 }
 
 bool WebTestWithWebController::ResetPageIfNavigationStalled(
     NSString* load_check) {
   NSString* inner_html = RunJavaScript(
       @"(document && document.body && document.body.innerHTML) || 'undefined'");
   if ([inner_html rangeOfString:load_check].location == NSNotFound) {
     [webController_ setWebUsageEnabled:NO];
     [webController_ setWebUsageEnabled:YES];
     [webController_ triggerPendingLoad];
     return true;
   }
   return false;
 }
 
 NSString* WebTestWithWebController::CreateLoadCheck() {
   return [NSString stringWithFormat:@"<p style=\"display: none;\">%d</p>",
                                     s_html_load_count++];
 }
 
 }  // namespace web