Do not store TestRunner in WebFrameTestClient.

components/test_runner/web_frame_test_client.h

 // Copyright 2016 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.
 
 #ifndef COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_CLIENT_H_
 #define COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_CLIENT_H_
 
 #include <map>
 #include <string>
 
 #include "base/macros.h"
 #include "third_party/WebKit/public/web/WebFrameClient.h"
 
 namespace test_runner {
 
 class AccessibilityController;
 class TestRunner;
 class WebFrameTestProxyBase;
 class WebTestDelegate;
 class WebViewTestProxyBase;
 
 // WebFrameTestClient implements WebFrameClient interface, providing behavior
 // expected by tests.  WebFrameTestClient ends up used by WebFrameTestProxy
 // which coordinates forwarding WebFrameClient calls either to
 // WebFrameTestClient or to the product code (i.e. to RenderFrameImpl).
 class WebFrameTestClient : public blink::WebFrameClient {
  public:
-  // Caller has to ensure that all arguments (|test_runner|, |delegate| and so
-  // forth) live longer than |this|.
-  WebFrameTestClient(TestRunner* test_runner,
-                     WebTestDelegate* delegate,
+  // Caller has to ensure that all arguments (|delegate|,
+  // |web_view_test_proxy_base_| and so forth) live longer than |this|.
+  WebFrameTestClient(WebTestDelegate* delegate,
                      WebViewTestProxyBase* web_view_test_proxy_base,
                      WebFrameTestProxyBase* web_frame_test_proxy_base);
 
   ~WebFrameTestClient() override;
 
   // WebFrameClient overrides needed by WebFrameTestProxy.
   blink::WebColorChooser* createColorChooser(
       blink::WebColorChooserClient* client,
       const blink::WebColor& initial_color,
       const blink::WebVector<blink::WebColorSuggestion>& suggestions) override;
@@ skipping 59 matching lines @@
   void checkIfAudioSinkExistsAndIsAuthorized(
       const blink::WebString& sink_id,
       const blink::WebSecurityOrigin& security_origin,
       blink::WebSetSinkIdCallbacks* web_callbacks) override;
   void didClearWindowObject(blink::WebLocalFrame* frame) override;
   bool runFileChooser(const blink::WebFileChooserParams& params,
                       blink::WebFileChooserCompletion* completion) override;
   blink::WebEffectiveConnectionType getEffectiveConnectionType() override;
 
  private:
+  TestRunner* test_runner();
+
   // Borrowed pointers to other parts of Layout Tests state.
-  TestRunner* test_runner_;
   WebTestDelegate* delegate_;
   WebViewTestProxyBase* web_view_test_proxy_base_;
   WebFrameTestProxyBase* web_frame_test_proxy_base_;
 
   DISALLOW_COPY_AND_ASSIGN(WebFrameTestClient);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_CLIENT_H_