Rename WebTestProxy to WebViewTestProxy.

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_TEST_PROXY_H_
 #define COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_
 
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 32 matching lines @@
 namespace test_runner {
 
 class AccessibilityController;
 class EventSender;
 class TestInterfaces;
 class TestRunnerForSpecificView;
 class TextInputController;
 class WebTestDelegate;
 class WebTestInterfaces;
 
-// WebTestProxyBase is the "brain" of WebTestProxy in the sense that
-// WebTestProxy does the bridge between RenderViewImpl and WebTestProxyBase and
-// when it requires a behavior to be different from the usual, it will call
-// WebTestProxyBase that implements the expected behavior.
-// See WebTestProxy class comments for more information.
-class TEST_RUNNER_EXPORT WebTestProxyBase {
+// 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.

[Łukasz Anforowicz, 2016/07/21 19:14:50]

This comment is not accurate (after my earlier CLs).  OTOH, I can't think of a
quick way to fix it, so probably not worth blocking this CL on the comment (+ as
I said the inaccuracy comes from my earlier CLs :-( ).

[lfg, 2016/07/22 04:24:50]

I see. Let's revisit this when I get WebWidgetTestProxy working. A lot of the
stuff happening in WebViewTestProxy is just to work around the diamond
inheritance of RenderView, so we should be able to simplify it a lot by having
two separate classes.

+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) {
@@ skipping 35 matching lines @@
   TestRunnerForSpecificView* view_test_runner() {
     return view_test_runner_.get();
   }
 
   void Reset();
   void BindTo(blink::WebLocalFrame* frame);
 
   void GetScreenOrientationForTesting(blink::WebScreenInfo&);
 
  protected:
-  WebTestProxyBase();
-  ~WebTestProxyBase();
+  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(WebTestProxyBase);
+  DISALLOW_COPY_AND_ASSIGN(WebViewTestProxyBase);
 };
 
-// WebTestProxy is used during LayoutTests and always instantiated, at time of
-// writing with Base=RenderViewImpl. It does not directly inherit from it for
+// WebViewTestProxy is used during LayoutTests and always instantiated, at time
+// of writing with Base=RenderViewImpl. It does not directly inherit from it for
 // layering purposes.
 // The intent of that class is to wrap RenderViewImpl for tests purposes in
 // order to reduce the amount of test specific code in the production code.
-// WebTestProxy is only doing the glue between RenderViewImpl and
-// WebTestProxyBase, that means that there is no logic living in this class
+// WebViewTestProxy is only doing the glue between RenderViewImpl and
+// WebViewTestProxyBase, that means that there is no logic living in this class
 // except deciding which base class should be called (could be both).
 //
 // Examples of usage:
-//  * when a fooClient has a mock implementation, WebTestProxy can override the
-//    fooClient() call and have WebTestProxyBase return the mock implementation.
-//  * when a value needs to be overridden by LayoutTests, WebTestProxy can
-//    override RenderViewImpl's getter and call a getter from WebTestProxyBase
-//    instead. In addition, WebTestProxyBase will have a public setter that
-//    could be called from the TestRunner.
+//  * when a fooClient has a mock implementation, WebViewTestProxy can override
+//    the fooClient() call and have WebViewTestProxyBase return the mock
+//    implementation.
+//  * when a value needs to be overridden by LayoutTests, WebViewTestProxy can
+//    override RenderViewImpl's getter and call a getter from
+//    WebViewTestProxyBase instead. In addition, WebViewTestProxyBase will have
+//    a public setter that could be called from the TestRunner.
 #if defined(OS_WIN)
-// WebTestProxy is a diamond-shaped hierarchy, with WebWidgetClient at the root.
-// VS warns when we inherit the WebWidgetClient method implementations from
-// RenderWidget. It's safe to ignore that warning.
+// WebViewTestProxy is a diamond-shaped hierarchy, with WebWidgetClient at the
+// root. VS warns when we inherit the WebWidgetClient method implementations
+// from RenderWidget. It's safe to ignore that warning.
 #pragma warning(disable: 4250)
 #endif
 template <class Base, typename... Args>
-class WebTestProxy : public Base, public WebTestProxyBase {
+class WebViewTestProxy : public Base, public WebViewTestProxyBase {
  public:
-  explicit WebTestProxy(Args... args) : Base(args...) {}
+  explicit WebViewTestProxy(Args... args) : Base(args...) {}
 
   // WebWidgetClient implementation.
   blink::WebScreenInfo screenInfo() override {
     blink::WebScreenInfo info = Base::screenInfo();
     blink::WebScreenInfo test_info = widget_test_client()->screenInfo();
     if (test_info.orientationType != blink::WebScreenOrientationUndefined) {
       info.orientationType = test_info.orientationType;
       info.orientationAngle = test_info.orientationAngle;
     }
     return info;
@@ skipping 37 matching lines @@
   }
   blink::WebView* createView(blink::WebLocalFrame* creator,
                              const blink::WebURLRequest& request,
                              const blink::WebWindowFeatures& features,
                              const blink::WebString& frame_name,
                              blink::WebNavigationPolicy policy,
                              bool suppress_opener) override {
     if (!view_test_client()->createView(creator, request, features, frame_name,
                                         policy, suppress_opener))
       return nullptr;
-    return Base::createView(
-        creator, request, features, frame_name, policy, suppress_opener);
+    return Base::createView(creator, request, features, frame_name, policy,
+                            suppress_opener);
   }
   void setStatusText(const blink::WebString& text) override {
     view_test_client()->setStatusText(text);
     Base::setStatusText(text);
   }
   void printPage(blink::WebLocalFrame* frame) override {
     view_test_client()->printPage(frame);
   }
   blink::WebSpeechRecognizer* speechRecognizer() override {
     return view_test_client()->speechRecognizer();
   }
   void showValidationMessage(
       const blink::WebRect& anchor_in_root_view,
       const blink::WebString& main_message,
       blink::WebTextDirection main_message_hint,
       const blink::WebString& sub_message,
       blink::WebTextDirection sub_message_hint) override {
     view_test_client()->showValidationMessage(anchor_in_root_view, main_message,
                                               main_message_hint, sub_message,
                                               sub_message_hint);
   }
   blink::WebString acceptLanguages() override {
     return view_test_client()->acceptLanguages();
   }
 
  private:
-  virtual ~WebTestProxy() {}
+  virtual ~WebViewTestProxy() {}
 
-  DISALLOW_COPY_AND_ASSIGN(WebTestProxy);
+  DISALLOW_COPY_AND_ASSIGN(WebViewTestProxy);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_WEB_TEST_PROXY_H_