Revert of Add WebWidgetTestProxy.

components/test_runner/web_view_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_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>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #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"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebDOMMessageEvent.h"
 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
 #include "third_party/WebKit/public/web/WebNavigationPolicy.h"
 #include "third_party/WebKit/public/web/WebTextDirection.h"
 #include "third_party/WebKit/public/web/WebViewClient.h"
@@ skipping 20 matching lines @@
 class TestRunnerForSpecificView;
 class TextInputController;
 class WebTestDelegate;
 class WebTestInterfaces;
 
 // WebViewTestProxyBase is the "brain" of WebViewTestProxy in the sense that
 // WebViewTestProxy does the bridge between RenderViewImpl and
 // 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);
     DCHECK(!web_view_);
     web_view_ = view;
   }
 
   void set_view_test_client(
       std::unique_ptr<WebViewTestClient> view_test_client) {
     DCHECK(view_test_client);
     DCHECK(!view_test_client_);
     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);
     DCHECK(!delegate_);
     delegate_ = delegate;
   }
 
   TestInterfaces* test_interfaces() { return test_interfaces_; }
   void SetInterfaces(WebTestInterfaces* web_test_interfaces);
 
@@ skipping 10 matching lines @@
   void Reset();
   void BindTo(blink::WebLocalFrame* frame);
 
   void GetScreenOrientationForTesting(blink::WebScreenInfo&);
 
  protected:
   WebViewTestProxyBase();
   ~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_;
   WebTestDelegate* delegate_;
   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_;
   std::unique_ptr<TestRunnerForSpecificView> view_test_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewTestProxyBase);
 };
 
 // WebViewTestProxy is used during LayoutTests and always instantiated, at time
 // of writing with Base=RenderViewImpl. It does not directly inherit from it for
@@ skipping 107 matching lines @@
   }
 
  private:
   virtual ~WebViewTestProxy() {}
 
   DISALLOW_COPY_AND_ASSIGN(WebViewTestProxy);
 };
 
 }  // namespace test_runner
 
-#endif  // COMPONENTS_TEST_RUNNER_WEB_VIEW_TEST_PROXY_H_
+#endif  // COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_