Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(606)

Unified Diff: content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

Issue 1821923003: Extract WebFrameClient implementation out of WebTestProxyBase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing... Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
diff --git a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
index 00b883944dede79950263eff11e26a9e0158cae6..489339fd7130f600e3da2232beba5c8fc12c6451 100644
--- a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
+++ b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
@@ -8,6 +8,7 @@
#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/web_cache/renderer/web_cache_render_process_observer.h"
@@ -45,10 +46,34 @@ using blink::WebThemeEngine;
namespace content {
+namespace {
+
+void WebTestProxyCreated(RenderView* render_view,
+ test_runner::WebTestProxyBase* proxy) {
+ BlinkTestRunner* test_runner = new BlinkTestRunner(render_view);
+ test_runner->set_proxy(proxy);
+ if (!LayoutTestRenderProcessObserver::GetInstance()->test_delegate()) {
+ LayoutTestRenderProcessObserver::GetInstance()->SetTestDelegate(
+ test_runner);
+ }
+ proxy->SetInterfaces(
+ LayoutTestRenderProcessObserver::GetInstance()->test_interfaces());
+ test_runner->proxy()->SetDelegate(
+ LayoutTestRenderProcessObserver::GetInstance()->test_delegate());
+}
+
+void WebFrameTestProxyCreated(RenderFrame* render_frame,
+ test_runner::WebFrameTestProxyBase* proxy) {
+ proxy->set_test_client(LayoutTestRenderProcessObserver::GetInstance()
+ ->test_interfaces()
+ ->GetWebFrameTestClient());
+}
+
+} // namespace
+
LayoutTestContentRendererClient::LayoutTestContentRendererClient() {
- EnableWebTestProxyCreation(
- base::Bind(&LayoutTestContentRendererClient::WebTestProxyCreated,
- base::Unretained(this)));
+ EnableWebTestProxyCreation(base::Bind(&WebTestProxyCreated),
+ base::Bind(&WebFrameTestProxyCreated));
}
LayoutTestContentRendererClient::~LayoutTestContentRendererClient() {
@@ -151,19 +176,4 @@ LayoutTestContentRendererClient::CreateMediaStreamRendererFactory() {
#endif
}
-void LayoutTestContentRendererClient::WebTestProxyCreated(
- RenderView* render_view,
- test_runner::WebTestProxyBase* proxy) {
- BlinkTestRunner* test_runner = new BlinkTestRunner(render_view);
- test_runner->set_proxy(proxy);
- if (!LayoutTestRenderProcessObserver::GetInstance()->test_delegate()) {
- LayoutTestRenderProcessObserver::GetInstance()->SetTestDelegate(
- test_runner);
- }
- proxy->SetInterfaces(
- LayoutTestRenderProcessObserver::GetInstance()->test_interfaces());
- test_runner->proxy()->SetDelegate(
- LayoutTestRenderProcessObserver::GetInstance()->test_delegate());
-}
-
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698