Service CreateNewWindow on the UI thread with a new mojo interface

content/public/test/mock_render_thread.cc

Index: content/public/test/mock_render_thread.cc
diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc
index c953a5d206d4ea5511e8e3791a0d461bdf6f2e6d..45c494eea780e162712cbf504e31b05d596efdce 100644
--- a/content/public/test/mock_render_thread.cc
+++ b/content/public/test/mock_render_thread.cc
@@ -29,18 +29,13 @@ namespace content {
 
 namespace {
 
-class MockRenderMessageFilterImpl : public mojom::RenderMessageFilter {
+class MockRenderMessageFilterUIImpl : public mojom::RenderMessageFilterUI {
  public:
-  explicit MockRenderMessageFilterImpl(MockRenderThread* thread)
+  explicit MockRenderMessageFilterUIImpl(MockRenderThread* thread)
       : thread_(thread) {}
-  ~MockRenderMessageFilterImpl() override {}
-
-  // mojom::RenderMessageFilter:
-  void GenerateRoutingID(const GenerateRoutingIDCallback& callback) override {
-    NOTREACHED();
-    callback.Run(MSG_ROUTING_NONE);
-  }
+  ~MockRenderMessageFilterUIImpl() override {}
 
+  // mojom::RenderMessageFilterUI:
   void CreateNewWindow(mojom::CreateNewWindowParamsPtr params,
                        const CreateNewWindowCallback& callback) override {
     // NOTE: This implementation of mojom::RenderMessageFilter is used client-
@@ -57,6 +52,22 @@ class MockRenderMessageFilterImpl : public mojom::RenderMessageFilter {
     return true;
   }
 
+ private:
+  MockRenderThread* const thread_;
+};
+
+class MockRenderMessageFilterImpl : public mojom::RenderMessageFilter {
+ public:
+  explicit MockRenderMessageFilterImpl(MockRenderThread* thread)
+      : thread_(thread) {}
+  ~MockRenderMessageFilterImpl() override {}
+
+  // mojom::RenderMessageFilter:
+  void GenerateRoutingID(const GenerateRoutingIDCallback& callback) override {
+    NOTREACHED();
+    callback.Run(MSG_ROUTING_NONE);
+  }
+
   void CreateNewWidget(int32_t opener_id,
                       blink::WebPopupType popup_type,
                       const CreateNewWidgetCallback& callback) override {
@@ -95,9 +106,12 @@ MockRenderThread::MockRenderThread()
       new_window_main_frame_routing_id_(0),
       new_window_main_frame_widget_routing_id_(0),
       new_frame_routing_id_(0),
-      mock_render_message_filter_(new MockRenderMessageFilterImpl(this)) {
+      mock_render_message_filter_(new MockRenderMessageFilterImpl(this)),
+      mock_render_message_filter_ui_(new MockRenderMessageFilterUIImpl(this)) {
   RenderThreadImpl::SetRenderMessageFilterForTesting(
       mock_render_message_filter_.get());
+  RenderThreadImpl::SetRenderMessageFilterUIForTesting(
+      mock_render_message_filter_ui_.get());
 }
 
 MockRenderThread::~MockRenderThread() {