Do not store TestRunner in WebFrameTestClient.

components/test_runner/web_test_interfaces.cc

 // 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 "components/test_runner/web_test_interfaces.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "components/test_runner/app_banner_client.h"
@@ skipping 75 matching lines @@
 std::unique_ptr<blink::WebAppBannerClient>
 WebTestInterfaces::CreateAppBannerClient() {
   std::unique_ptr<AppBannerClient> client(new AppBannerClient);
   interfaces_->SetAppBannerClient(client.get());
   return std::move(client);
 }
 
 std::unique_ptr<WebFrameTestClient> WebTestInterfaces::CreateWebFrameTestClient(
     WebViewTestProxyBase* web_view_test_proxy_base,
     WebFrameTestProxyBase* web_frame_test_proxy_base) {
-  return base::MakeUnique<WebFrameTestClient>(
-      interfaces_->GetTestRunner(), interfaces_->GetDelegate(),
-      web_view_test_proxy_base, web_frame_test_proxy_base);
+  // TODO(lukasza): Do not pass the WebTestDelegate below - it's lifetime can
+  // differ from the lifetime of WebFrameTestClient - https://crbug.com/606594.
+  return base::MakeUnique<WebFrameTestClient>(interfaces_->GetDelegate(),
+                                              web_view_test_proxy_base,
+                                              web_frame_test_proxy_base);
 }
 
 std::unique_ptr<WebViewTestClient> WebTestInterfaces::CreateWebViewTestClient(
     WebViewTestProxyBase* web_view_test_proxy_base) {
-  return base::MakeUnique<WebViewTestClient>(interfaces_->GetTestRunner(),
-                                             web_view_test_proxy_base);
+  return base::MakeUnique<WebViewTestClient>(web_view_test_proxy_base);
 }
 
 std::unique_ptr<WebWidgetTestClient>
 WebTestInterfaces::CreateWebWidgetTestClient(
     WebWidgetTestProxyBase* web_widget_test_proxy_base) {
   return base::MakeUnique<WebWidgetTestClient>(interfaces_->GetTestRunner(),
                                                web_widget_test_proxy_base);
 }
 
 std::vector<blink::WebView*> WebTestInterfaces::GetWindowList() {
   std::vector<blink::WebView*> result;
   for (WebViewTestProxyBase* proxy : interfaces_->GetWindowList())
     result.push_back(proxy->web_view());
   return result;
 }
 
 }  // namespace test_runner