Rename WebTestProxy to WebViewTestProxy.

components/test_runner/web_widget_test_client.cc

Index: components/test_runner/web_widget_test_client.cc
diff --git a/components/test_runner/web_widget_test_client.cc b/components/test_runner/web_widget_test_client.cc
index e40cf2652986550ecc89239e242467e6c5db6a86..a3e65061f88931334c3a5ff8716a6efc77346caa 100644
--- a/components/test_runner/web_widget_test_client.cc
+++ b/components/test_runner/web_widget_test_client.cc
@@ -14,21 +14,22 @@
 #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/WebScreenInfo.h"
 #include "third_party/WebKit/public/web/WebPagePopup.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 
 namespace test_runner {
 
-WebWidgetTestClient::WebWidgetTestClient(TestRunner* test_runner,
-                                         WebTestProxyBase* web_test_proxy_base)
+WebWidgetTestClient::WebWidgetTestClient(
+    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),
       animation_scheduled_(false),
       weak_factory_(this) {
   DCHECK(test_runner);
-  DCHECK(web_test_proxy_base);
+  DCHECK(web_view_test_proxy_base);
 }
 
 WebWidgetTestClient::~WebWidgetTestClient() {}
@@ -39,9 +40,9 @@ void WebWidgetTestClient::scheduleAnimation() {
 
   if (!animation_scheduled_) {
     animation_scheduled_ = true;
-    test_runner_->OnAnimationScheduled(web_test_proxy_base_->web_widget());
+    test_runner_->OnAnimationScheduled(web_view_test_proxy_base_->web_widget());
 
-    web_test_proxy_base_->delegate()->PostDelayedTask(
+    web_view_test_proxy_base_->delegate()->PostDelayedTask(
         new WebCallbackTask(base::Bind(&WebWidgetTestClient::AnimateNow,
                                        weak_factory_.GetWeakPtr())),
         1);
@@ -50,7 +51,7 @@ void WebWidgetTestClient::scheduleAnimation() {
 
 void WebWidgetTestClient::AnimateNow() {
   if (animation_scheduled_) {
-    blink::WebWidget* web_widget = web_test_proxy_base_->web_widget();
+    blink::WebWidget* web_widget = web_view_test_proxy_base_->web_widget();
     animation_scheduled_ = false;
     test_runner_->OnAnimationBegun(web_widget);
 
@@ -67,11 +68,11 @@ void WebWidgetTestClient::AnimateNow() {
 blink::WebScreenInfo WebWidgetTestClient::screenInfo() {
   blink::WebScreenInfo screen_info;
   MockScreenOrientationClient* mock_client =
-      web_test_proxy_base_->test_interfaces()
+      web_view_test_proxy_base_->test_interfaces()
           ->GetTestRunner()
           ->getMockScreenOrientationClient();
   if (mock_client->IsDisabled()) {
-    // Indicate to WebTestProxy that there is no test/mock info.
+    // Indicate to WebViewTestProxy that there is no test/mock info.
     screen_info.orientationType = blink::WebScreenOrientationUndefined;
   } else {
     // Override screen orientation information with mock data.
@@ -82,15 +83,15 @@ blink::WebScreenInfo WebWidgetTestClient::screenInfo() {
 }
 
 bool WebWidgetTestClient::requestPointerLock() {
-  return web_test_proxy_base_->view_test_runner()->RequestPointerLock();
+  return web_view_test_proxy_base_->view_test_runner()->RequestPointerLock();
 }
 
 void WebWidgetTestClient::requestPointerUnlock() {
-  web_test_proxy_base_->view_test_runner()->RequestPointerUnlock();
+  web_view_test_proxy_base_->view_test_runner()->RequestPointerUnlock();
 }
 
 bool WebWidgetTestClient::isPointerLocked() {
-  return web_test_proxy_base_->view_test_runner()->isPointerLocked();
+  return web_view_test_proxy_base_->view_test_runner()->isPointerLocked();
 }
 
 void WebWidgetTestClient::setToolTipText(const blink::WebString& text,
@@ -101,8 +102,8 @@ void WebWidgetTestClient::setToolTipText(const blink::WebString& text,
 void WebWidgetTestClient::resetInputMethod() {
   // If a composition text exists, then we need to let the browser process
   // to cancel the input method's ongoing composition session.
-  if (web_test_proxy_base_)
-    web_test_proxy_base_->web_widget()->confirmComposition();
+  if (web_view_test_proxy_base_)
+    web_view_test_proxy_base_->web_widget()->confirmComposition();
 }
 
 }  // namespace test_runner