GuestView: Decouple extension IPCs from soon-to-be component IPCs

extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc

 // Copyright 2014 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 "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
 
 #include "base/strings/stringprintf.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/stream_handle.h"
 #include "content/public/browser/stream_info.h"
 #include "content/public/common/service_registry.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/api/mime_handler_private/mime_handler_private.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.h"
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_constants.h"
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
+#include "extensions/common/guest_view/extensions_guest_view_messages.h"
 #include "extensions/common/guest_view/guest_view_constants.h"
-#include "extensions/common/guest_view/guest_view_messages.h"
 #include "extensions/strings/grit/extensions_strings.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/base/url_util.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 using content::WebContents;
 
 namespace extensions {
 
 StreamContainer::StreamContainer(scoped_ptr<content::StreamInfo> stream,
@@ skipping 203 matching lines @@
   if (!attached())
     return false;
 
   embedder_web_contents()->SaveFrame(stream_->stream_info()->original_url,
                                      referrer);
   return true;
 }
 
 void MimeHandlerViewGuest::DocumentOnLoadCompletedInMainFrame() {
   embedder_web_contents()->Send(
-      new GuestViewMsg_MimeHandlerViewGuestOnLoadCompleted(
+      new ExtensionsGuestViewMsg_MimeHandlerViewGuestOnLoadCompleted(
           element_instance_id()));
 }
 
 bool MimeHandlerViewGuest::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(MimeHandlerViewGuest, message)
     IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnRequest)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 base::WeakPtr<StreamContainer> MimeHandlerViewGuest::GetStream() const {
   if (!stream_)
     return base::WeakPtr<StreamContainer>();
   return stream_->GetWeakPtr();
 }
 
 void MimeHandlerViewGuest::OnRequest(
     const ExtensionHostMsg_Request_Params& params) {
   if (extension_function_dispatcher_) {
     extension_function_dispatcher_->Dispatch(
         params, web_contents()->GetRenderViewHost());
   }
 }
 
 }  // namespace extensions