Rename WebTestProxy to WebViewTestProxy.

content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

 // Copyright (c) 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.
 
 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "components/test_runner/mock_credential_manager_client.h"
 #include "components/test_runner/web_frame_test_proxy.h"
 #include "components/test_runner/web_test_interfaces.h"
-#include "components/test_runner/web_test_proxy.h"
 #include "components/test_runner/web_test_runner.h"
+#include "components/test_runner/web_view_test_proxy.h"
 #include "components/web_cache/renderer/web_cache_impl.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/test/layouttest_support.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/layout_test/blink_test_helpers.h"
 #include "content/shell/renderer/layout_test/blink_test_runner.h"
 #include "content/shell/renderer/layout_test/layout_test_render_frame_observer.h"
@@ skipping 20 matching lines @@
 using blink::WebPlugin;
 using blink::WebPluginParams;
 using blink::WebRTCPeerConnectionHandler;
 using blink::WebRTCPeerConnectionHandlerClient;
 using blink::WebThemeEngine;
 
 namespace content {
 
 namespace {
 
-void WebTestProxyCreated(RenderView* render_view,
-                         test_runner::WebTestProxyBase* proxy) {
+void WebViewTestProxyCreated(RenderView* render_view,
+                             test_runner::WebViewTestProxyBase* proxy) {
   test_runner::WebTestInterfaces* interfaces =
       LayoutTestRenderThreadObserver::GetInstance()->test_interfaces();
 
   BlinkTestRunner* test_runner = new BlinkTestRunner(render_view);
   // TODO(lukasza): Using the 1st BlinkTestRunner as the main delegate is wrong,
   // but it is difficult to change because this behavior has been baked for a
   // long time into test assumptions (i.e. which PrintMessage gets delivered to
   // the browser depends on this).
   static bool first_test_runner = true;
   if (first_test_runner) {
     first_test_runner = false;
     interfaces->SetDelegate(test_runner);
   }
 
   proxy->set_delegate(test_runner);
   proxy->set_view_test_client(LayoutTestRenderThreadObserver::GetInstance()
                                   ->test_interfaces()
                                   ->CreateWebViewTestClient(proxy));
   proxy->set_widget_test_client(LayoutTestRenderThreadObserver::GetInstance()
                                     ->test_interfaces()
                                     ->CreateWebWidgetTestClient(proxy));
   proxy->SetInterfaces(interfaces);
 }
 
 void WebFrameTestProxyCreated(RenderFrame* render_frame,
                               test_runner::WebFrameTestProxyBase* proxy) {
-  test_runner::WebTestProxyBase* web_test_proxy_base =
-      GetWebTestProxyBase(render_frame->GetRenderView());
+  test_runner::WebViewTestProxyBase* web_view_test_proxy_base =
+      GetWebViewTestProxyBase(render_frame->GetRenderView());
   proxy->set_test_client(
       LayoutTestRenderThreadObserver::GetInstance()
           ->test_interfaces()
-          ->CreateWebFrameTestClient(web_test_proxy_base, proxy));
+          ->CreateWebFrameTestClient(web_view_test_proxy_base, proxy));
 }
 
 }  // namespace
 
 LayoutTestContentRendererClient::LayoutTestContentRendererClient() {
-  EnableWebTestProxyCreation(base::Bind(&WebTestProxyCreated),
-                             base::Bind(&WebFrameTestProxyCreated));
+  EnableWebViewTestProxyCreation(base::Bind(&WebViewTestProxyCreated),
+                                 base::Bind(&WebFrameTestProxyCreated));
 }
 
 LayoutTestContentRendererClient::~LayoutTestContentRendererClient() {
 }
 
 void LayoutTestContentRendererClient::RenderThreadStarted() {
   ShellContentRendererClient::RenderThreadStarted();
   shell_observer_.reset(new LayoutTestRenderThreadObserver());
 }
 
 void LayoutTestContentRendererClient::RenderFrameCreated(
     RenderFrame* render_frame) {
   test_runner::WebFrameTestProxyBase* frame_proxy =
       GetWebFrameTestProxyBase(render_frame);
   frame_proxy->set_web_frame(render_frame->GetWebFrame());
   new LayoutTestRenderFrameObserver(render_frame);
 }
 
 void LayoutTestContentRendererClient::RenderViewCreated(
     RenderView* render_view) {
   new ShellRenderViewObserver(render_view);
 
-  test_runner::WebTestProxyBase* proxy = GetWebTestProxyBase(render_view);
+  test_runner::WebViewTestProxyBase* proxy =
+      GetWebViewTestProxyBase(render_view);
   proxy->set_web_view(render_view->GetWebView());
   // TODO(lfg): We should fix the TestProxy to track the WebWidgets on every
   // local root in WebFrameTestProxy instead of having only the WebWidget for
-  // the main frame in WebTestProxy.
+  // the main frame in WebViewTestProxy.
   proxy->set_web_widget(render_view->GetWebView()->widget());
   proxy->Reset();
 
   BlinkTestRunner* test_runner = BlinkTestRunner::Get(render_view);
   test_runner->Reset(false /* for_new_test */);
 
   LayoutTestRenderThreadObserver::GetInstance()
       ->test_interfaces()
       ->TestRunner()
       ->InitializeWebViewWithMocks(render_view->GetWebView());
@@ skipping 68 matching lines @@
   return nullptr;
 #endif
 }
 
 void LayoutTestContentRendererClient::DidInitializeWorkerContextOnWorkerThread(
     v8::Local<v8::Context> context) {
   blink::WebTestingSupport::injectInternalsObject(context);
 }
 
 }  // namespace content