Move ViewHostMsg_CreateWindow to mojom

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/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/common/frame_messages.h"
+#include "content/common/render_message_filter.mojom.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/render_thread_observer.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_sync_message.h"
 #include "ipc/message_filter.h"
 #include "services/shell/public/cpp/interface_provider.h"
 #include "services/shell/public/cpp/interface_registry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebScriptController.h"
 
 namespace content {
 
+namespace {
+
+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 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();
+  }
+
+  // Note that

[ncarter (slow), 2016/09/27 20:32:41]

?

[Ken Rockot(use gerrit already), 2016/09/27 21:05:41]

Oops. :>   Removed - this was going to be the comment which is now in the method
above.

+  bool CreateNewWindow(mojom::CreateNewWindowParamsPtr params,
+                       mojom::CreateNewWindowReplyPtr* reply) override {
+    *reply = mojom::CreateNewWindowReply::New();
+    thread_->OnCreateWindow(*params, reply->get());
+    return true;
+  }
+
+ private:
+  MockRenderThread* const thread_;
+};
+
+}  // 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) {}
+      new_frame_routing_id_(0),
+      mock_render_message_filter_(new MockRenderMessageFilterImpl(this)) {
+  RenderThreadImpl::SetRenderMessageFilterForTesting(
+      mock_render_message_filter_.get());
+}
 
 MockRenderThread::~MockRenderThread() {
   while (!filters_.empty()) {
     scoped_refptr<IPC::MessageFilter> filter = filters_.back();
     filters_.pop_back();
     filter->OnFilterRemoved();
   }
 }
 
 // Called by the Widget. Used to send messages to the browser.
@@ skipping 169 matching lines @@
 }
 
 // The Widget expects to be returned valid route_id.
 void MockRenderThread::OnCreateWidget(int opener_id,
                                       blink::WebPopupType popup_type,
                                       int* route_id) {
   opener_id_ = opener_id;
   *route_id = routing_id_;
 }
 
-// The View expects to be returned a valid route_id different from its own.
-void MockRenderThread::OnCreateWindow(
-    const ViewHostMsg_CreateWindow_Params& params,
-    ViewHostMsg_CreateWindow_Reply* 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;
-}
-
 // The Frame expects to be returned a valid route_id different from its own.
 void MockRenderThread::OnCreateChildFrame(
     const FrameHostMsg_CreateChildFrame_Params& params,
     int* new_render_frame_id) {
   *new_render_frame_id = new_frame_routing_id_++;
 }
 
 bool MockRenderThread::OnControlMessageReceived(const IPC::Message& msg) {
   base::ObserverListBase<RenderThreadObserver>::Iterator it(&observers_);
   RenderThreadObserver* observer;
   while ((observer = it.GetNext()) != NULL) {
     if (observer->OnControlMessageReceived(msg))
       return true;
   }
   return OnMessageReceived(msg);
 }
 
 bool MockRenderThread::OnMessageReceived(const IPC::Message& msg) {
   // Save the message in the sink.
   sink_.OnMessageReceived(msg);
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(MockRenderThread, msg)
     IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWidget, OnCreateWidget)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_CreateWindow, OnCreateWindow)
     IPC_MESSAGE_HANDLER(FrameHostMsg_CreateChildFrame, OnCreateChildFrame)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 #if defined(OS_WIN)
 void MockRenderThread::OnDuplicateSection(
     base::SharedMemoryHandle renderer_handle,
     base::SharedMemoryHandle* browser_handle) {
   // We don't have to duplicate the input handles since RenderViewTest does not
   // separate a browser process from a renderer process.
   *browser_handle = renderer_handle;
 }
 #endif  // defined(OS_WIN)
 
+// The View expects to be returned a valid route_id different from its own.
+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