Revert of Add WebWidgetTestProxy.

components/test_runner/web_view_test_proxy.h

Index: components/test_runner/web_view_test_proxy.h
diff --git a/components/test_runner/web_view_test_proxy.h b/components/test_runner/web_view_test_proxy.h
index dca53591e3e886382089330574393b9bb523f695..944731c87bffd6520ecc5f8207b288620362c638 100644
--- a/components/test_runner/web_view_test_proxy.h
+++ b/components/test_runner/web_view_test_proxy.h
@@ -2,8 +2,8 @@
 // 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_VIEW_TEST_PROXY_H_
-#define COMPONENTS_TEST_RUNNER_WEB_VIEW_TEST_PROXY_H_
+#ifndef COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_
+#define COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_
 
 #include <memory>
 #include <string>
@@ -15,7 +15,6 @@
 #include "components/test_runner/test_runner_export.h"
 #include "components/test_runner/web_view_test_client.h"
 #include "components/test_runner/web_widget_test_client.h"
-#include "components/test_runner/web_widget_test_proxy.h"
 #include "third_party/WebKit/public/platform/WebDragOperation.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
@@ -56,8 +55,15 @@
 // WebViewTestProxyBase and when it requires a behavior to be different from the
 // usual, it will call WebViewTestProxyBase that implements the expected
 // behavior. See WebViewTestProxy class comments for more information.
-class TEST_RUNNER_EXPORT WebViewTestProxyBase : public WebWidgetTestProxyBase {
+class TEST_RUNNER_EXPORT WebViewTestProxyBase {
  public:
+  blink::WebWidget* web_widget() { return web_widget_; }
+  void set_web_widget(blink::WebWidget* widget) {
+    DCHECK(widget);
+    DCHECK(!web_widget_);
+    web_widget_ = widget;
+  }
+
   blink::WebView* web_view() { return web_view_; }
   void set_web_view(blink::WebView* view) {
     DCHECK(view);
@@ -72,6 +78,13 @@
     view_test_client_ = std::move(view_test_client);
   }
 
+  void set_widget_test_client(
+      std::unique_ptr<WebWidgetTestClient> widget_test_client) {
+    DCHECK(widget_test_client);
+    DCHECK(!widget_test_client_);
+    widget_test_client_ = std::move(widget_test_client);
+  }
+
   WebTestDelegate* delegate() { return delegate_; }
   void set_delegate(WebTestDelegate* delegate) {
     DCHECK(delegate);
@@ -102,6 +115,9 @@
   ~WebViewTestProxyBase();
 
   blink::WebViewClient* view_test_client() { return view_test_client_.get(); }
+  blink::WebWidgetClient* widget_test_client() {
+    return widget_test_client_.get();
+  }
 
  private:
   TestInterfaces* test_interfaces_;
@@ -109,6 +125,7 @@
   blink::WebView* web_view_;
   blink::WebWidget* web_widget_;
   std::unique_ptr<WebViewTestClient> view_test_client_;
+  std::unique_ptr<WebWidgetTestClient> widget_test_client_;
   std::unique_ptr<AccessibilityController> accessibility_controller_;
   std::unique_ptr<EventSender> event_sender_;
   std::unique_ptr<TextInputController> text_input_controller_;
@@ -236,4 +253,4 @@
 
 }  // namespace test_runner
 
-#endif  // COMPONENTS_TEST_RUNNER_WEB_VIEW_TEST_PROXY_H_
+#endif  // COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_