Extract WebViewClient implementation out of WebTestProxyBase.

components/test_runner/web_frame_test_proxy.h

 // Copyright 2014 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_PROXY_H_
 #define COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
 
+#include <utility>
+
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "components/test_runner/test_runner_export.h"
+#include "components/test_runner/web_frame_test_client.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebFrameClient.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 namespace test_runner {
 
-class WebFrameTestProxyBase {
+class TEST_RUNNER_EXPORT WebFrameTestProxyBase {
  public:
-  void set_test_client(blink::WebFrameClient* client) {
+  void set_test_client(scoped_ptr<WebFrameTestClient> client) {
     DCHECK(client);
     DCHECK(!test_client_);
-    test_client_ = client;
+    test_client_ = std::move(client);
   }
 
  protected:
-  WebFrameTestProxyBase() : test_client_(nullptr) {}
-  blink::WebFrameClient* test_client() { return test_client_; }
+  WebFrameTestProxyBase();
+  ~WebFrameTestProxyBase();
+  blink::WebFrameClient* test_client() { return test_client_.get(); }
 
  private:
-  blink::WebFrameClient* test_client_;
+  scoped_ptr<WebFrameTestClient> test_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxyBase);
 };
 
 // WebTestProxy is used during LayoutTests and always instantiated, at time of
 // writing with Base=RenderFrameImpl. It does not directly inherit from it for
 // layering purposes.
 template <class Base, typename P>
 class WebFrameTestProxy : public Base, public WebFrameTestProxyBase {
  public:
@@ skipping 240 matching lines @@
         sink_id, security_origin, web_callbacks);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_