Move GuestView IPCs into their own messages file.

BUG=444869

Review URL: https://codereview.chromium.org/892923002

Cr-Commit-Position: refs/heads/master@{#314233}

3 files changed, 14 insertions, 13 deletions

diff --git a/extensions/renderer/guest_view/extensions_guest_view_container.cc b/extensions/renderer/guest_view/extensions_guest_view_container.cc
index 3a5359f..6f2dd0e 100644
--- a/extensions/renderer/guest_view/extensions_guest_view_container.cc
+++ b/extensions/renderer/guest_view/extensions_guest_view_container.cc
@@ -6,8 +6,8 @@
 
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
-#include "extensions/common/extension_messages.h"
 #include "extensions/common/guest_view/guest_view_constants.h"
+#include "extensions/common/guest_view/guest_view_messages.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
 #include "third_party/WebKit/public/web/WebView.h"
@@ -62,7 +62,7 @@ void ExtensionsGuestViewContainer::AttachRequest::PerformRequest() {
 
   // Step 1, send the attach params to extensions/.
   container()->render_frame()->Send(
-      new ExtensionHostMsg_AttachGuest(container()->render_view_routing_id(),
+      new GuestViewHostMsg_AttachGuest(container()->render_view_routing_id(),
                                        container()->element_instance_id(),
                                        guest_instance_id_,
                                        *params_));
@@ -73,8 +73,8 @@ void ExtensionsGuestViewContainer::AttachRequest::PerformRequest() {
 
 void ExtensionsGuestViewContainer::AttachRequest::HandleResponse(
     const IPC::Message& message) {
-  ExtensionMsg_GuestAttached::Param param;
-  if (!ExtensionMsg_GuestAttached::Read(&message, &param))
+  GuestViewMsg_GuestAttached::Param param;
+  if (!GuestViewMsg_GuestAttached::Read(&message, &param))
     return;
 
   // If we don't have a callback then there's nothing more to do.
diff --git a/extensions/renderer/guest_view/guest_view_container.cc b/extensions/renderer/guest_view/guest_view_container.cc
index a6ce352..636acb8 100644
--- a/extensions/renderer/guest_view/guest_view_container.cc
+++ b/extensions/renderer/guest_view/guest_view_container.cc
@@ -7,8 +7,8 @@
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_view.h"
-#include "extensions/common/extension_messages.h"
 #include "extensions/common/guest_view/guest_view_constants.h"
+#include "extensions/common/guest_view/guest_view_messages.h"
 
 namespace extensions {
 
@@ -50,10 +50,10 @@ GuestViewContainer::~GuestViewContainer() {}
 // static.
 bool GuestViewContainer::HandlesMessage(const IPC::Message& msg) {
   switch (msg.type()) {
-    case ExtensionMsg_CreateMimeHandlerViewGuestACK::ID:
-    case ExtensionMsg_GuestAttached::ID:
-    case ExtensionMsg_GuestDetached::ID:
-    case ExtensionMsg_MimeHandlerViewGuestOnLoadCompleted::ID:
+    case GuestViewMsg_CreateMimeHandlerViewGuestACK::ID:
+    case GuestViewMsg_GuestAttached::ID:
+    case GuestViewMsg_GuestDetached::ID:
+    case GuestViewMsg_MimeHandlerViewGuestOnLoadCompleted::ID:
       return true;
     default:
       return false;
diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
index 9a7a1bc..52e9283 100644
--- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
+++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
@@ -13,6 +13,7 @@
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_constants.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/guest_view/guest_view_constants.h"
+#include "extensions/common/guest_view/guest_view_messages.h"
 #include "gin/arguments.h"
 #include "gin/dictionary.h"
 #include "gin/handle.h"
@@ -154,10 +155,10 @@ void MimeHandlerViewContainer::DidReceiveData(const char* data,
 bool MimeHandlerViewContainer::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(MimeHandlerViewContainer, message)
-  IPC_MESSAGE_HANDLER(ExtensionMsg_CreateMimeHandlerViewGuestACK,
+  IPC_MESSAGE_HANDLER(GuestViewMsg_CreateMimeHandlerViewGuestACK,
                       OnCreateMimeHandlerViewGuestACK)
-  IPC_MESSAGE_HANDLER(ExtensionMsg_GuestAttached, OnGuestAttached)
-  IPC_MESSAGE_HANDLER(ExtensionMsg_MimeHandlerViewGuestOnLoadCompleted,
+  IPC_MESSAGE_HANDLER(GuestViewMsg_GuestAttached, OnGuestAttached)
+  IPC_MESSAGE_HANDLER(GuestViewMsg_MimeHandlerViewGuestOnLoadCompleted,
                       OnMimeHandlerViewGuestOnLoadCompleted)
   IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ -299,7 +300,7 @@ void MimeHandlerViewContainer::CreateMimeHandlerViewGuest() {
   if (!render_frame())
     return;
 
-  render_frame()->Send(new ExtensionHostMsg_CreateMimeHandlerViewGuest(
+  render_frame()->Send(new GuestViewHostMsg_CreateMimeHandlerViewGuest(
       render_frame()->GetRoutingID(), view_id_, element_instance_id(),
       element_size_));
 }