Rename WebTestProxy to WebViewTestProxy.

components/test_runner/web_view_test_client.cc

 // 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.
 
 #include "components/test_runner/web_view_test_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "components/test_runner/event_sender.h"
 #include "components/test_runner/mock_web_speech_recognizer.h"
 #include "components/test_runner/test_common.h"
 #include "components/test_runner/test_runner.h"
 #include "components/test_runner/test_runner_for_specific_view.h"
 #include "components/test_runner/web_task.h"
 #include "components/test_runner/web_test_delegate.h"
-#include "components/test_runner/web_test_proxy.h"
+#include "components/test_runner/web_view_test_proxy.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebPagePopup.h"
 #include "third_party/WebKit/public/web/WebPrintParams.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 
 namespace test_runner {
 
-WebViewTestClient::WebViewTestClient(TestRunner* test_runner,
-                                     WebTestProxyBase* web_test_proxy_base)
+WebViewTestClient::WebViewTestClient(
+    TestRunner* test_runner,
+    WebViewTestProxyBase* web_view_test_proxy_base)
     : test_runner_(test_runner),
-      web_test_proxy_base_(web_test_proxy_base) {
+      web_view_test_proxy_base_(web_view_test_proxy_base) {
   DCHECK(test_runner);
-  DCHECK(web_test_proxy_base);
+  DCHECK(web_view_test_proxy_base);
 }
 
 WebViewTestClient::~WebViewTestClient() {}
 
 void WebViewTestClient::startDragging(blink::WebLocalFrame* frame,
                                       const blink::WebDragData& data,
                                       blink::WebDragOperationsMask mask,
                                       const blink::WebImage& image,
                                       const blink::WebPoint& point) {
   test_runner_->setDragImage(image);
 
   // When running a test, we need to fake a drag drop operation otherwise
   // Windows waits for real mouse events to know when the drag is over.
-  web_test_proxy_base_->event_sender()->DoDragDrop(data, mask);
+  web_view_test_proxy_base_->event_sender()->DoDragDrop(data, mask);
 }
 
 // The output from these methods in layout test mode should match that
 // expected by the layout tests. See EditingDelegate.m in DumpRenderTree.
 
 void WebViewTestClient::didChangeContents() {
   if (test_runner_->shouldDumpEditingCallbacks())
     delegate()->PrintMessage(
         "EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification\n");
 }
@@ skipping 10 matching lines @@
                              URLDescription(request.url()) + "' is '" +
                              WebNavigationPolicyToString(policy) + "'\n");
   }
 
   if (!test_runner_->canOpenWindows())
     return nullptr;
   if (test_runner_->shouldDumpCreateView())
     delegate()->PrintMessage(std::string("createView(") +
                              URLDescription(request.url()) + ")\n");
 
-  // The return value below is used to communicate to WebTestProxy whether it
-  // should forward the createView request to RenderViewImpl or not.  The
+  // The return value below is used to communicate to WebViewTestProxy whether
+  // it should forward the createView request to RenderViewImpl or not.  The
   // somewhat ugly cast is used to do this while fitting into the existing
   // WebViewClient interface.
   return reinterpret_cast<blink::WebView*>(0xdeadbeef);
 }
 
 void WebViewTestClient::setStatusText(const blink::WebString& text) {
   if (!test_runner_->shouldDumpStatusCallbacks())
     return;
   delegate()->PrintMessage(
       std::string("UI DELEGATE STATUS CALLBACK: setStatusText:") +
@@ skipping 43 matching lines @@
 
 blink::WebSpeechRecognizer* WebViewTestClient::speechRecognizer() {
   return test_runner_->getMockWebSpeechRecognizer();
 }
 
 blink::WebString WebViewTestClient::acceptLanguages() {
   return blink::WebString::fromUTF8(test_runner_->GetAcceptLanguages());
 }
 
 WebTestDelegate* WebViewTestClient::delegate() {
-  return web_test_proxy_base_->delegate();
+  return web_view_test_proxy_base_->delegate();
 }
 
 void WebViewTestClient::didFocus() {
-  test_runner_->SetFocus(web_test_proxy_base_->web_view(), true);
+  test_runner_->SetFocus(web_view_test_proxy_base_->web_view(), true);
 }
 
 }  // namespace test_runner