Move ViewHostMsg_CreateWidget 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"
@@ skipping 30 matching lines @@
 
   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
   bool CreateNewWindow(mojom::CreateNewWindowParamsPtr params,
                        mojom::CreateNewWindowReplyPtr* reply) override {
     *reply = mojom::CreateNewWindowReply::New();
     thread_->OnCreateWindow(*params, reply->get());
     return true;
   }
 
+  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 {
+    thread_->OnCreateWidget(opener_id, popup_type, route_id);
+    return true;
+  }
+
  private:
   MockRenderThread* const thread_;
 };
 
 }  // namespace
 
 MockRenderThread::MockRenderThread()
     : routing_id_(0),
       opener_id_(0),
       new_window_routing_id_(0),
@@ skipping 180 matching lines @@
     remote_interfaces_->Bind(std::move(remote_interface_provider));
   }
   return remote_interfaces_.get();
 }
 
 void MockRenderThread::SendCloseMessage() {
   ViewMsg_Close msg(routing_id_);
   RenderViewImpl::FromRoutingID(routing_id_)->OnMessageReceived(msg);
 }
 
-// The Widget expects to be returned valid route_id.
+// The Widget expects to be returned a 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 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) {
   for (auto& observer : observers_) {
     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(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