Service CreateNewWindow on the UI thread with a new mojo interface

content/public/test/mock_render_thread.cc

 // Copyright (c) 2012 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/public/test/mock_render_thread.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 11 matching lines @@
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebScriptController.h"
 
 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 {}
+  ~MockRenderMessageFilterUIImpl() override {}
 
-  // mojom::RenderMessageFilter:
-  void GenerateRoutingID(const GenerateRoutingIDCallback& callback) override {
-    NOTREACHED();
-    callback.Run(MSG_ROUTING_NONE);
-  }
-
+  // mojom::RenderMessageFilterUI:
   void CreateNewWindow(mojom::CreateNewWindowParamsPtr params,
                        const CreateNewWindowCallback& callback) override {
     // NOTE: This implementation of mojom::RenderMessageFilter is used client-
     // side only. Because sync mojom methods have a different interface for
     // bindings- and client-side, we only implement the client-side interface
     // on this object.
     NOTREACHED();
   }
 
   bool CreateNewWindow(mojom::CreateNewWindowParamsPtr params,
                        mojom::CreateNewWindowReplyPtr* reply) override {
     *reply = mojom::CreateNewWindowReply::New();
     thread_->OnCreateWindow(*params, reply->get());
     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 {
     // See comment in CreateNewWindow().
     NOTREACHED();
   }
 
   bool CreateNewWidget(int32_t opener_id,
                        blink::WebPopupType popup_type,
                        int32_t* route_id) override {
@@ skipping 18 matching lines @@
 
 }  // namespace
 
 MockRenderThread::MockRenderThread()
     : routing_id_(0),
       opener_id_(0),
       new_window_routing_id_(0),
       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() {
   while (!filters_.empty()) {
     scoped_refptr<IPC::MessageFilter> filter = filters_.back();
     filters_.pop_back();
     filter->OnFilterRemoved();
   }
 }
 
@@ skipping 230 matching lines @@
 void MockRenderThread::OnCreateWindow(
     const mojom::CreateNewWindowParams& params,
     mojom::CreateNewWindowReply* reply) {
   reply->route_id = new_window_routing_id_;
   reply->main_frame_route_id = new_window_main_frame_routing_id_;
   reply->main_frame_widget_route_id = new_window_main_frame_widget_routing_id_;
   reply->cloned_session_storage_namespace_id = 0;
 }
 
 }  // namespace content