Allow MimeHandlerViewGuest be embedded inside OOPIFs

components/guest_view/browser/guest_view_message_filter.cc

 // Copyright 2015 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 "components/guest_view/browser/guest_view_message_filter.h"
 
 #include "base/memory/ptr_util.h"
 #include "components/guest_view/browser/guest_view_base.h"
 #include "components/guest_view/browser/guest_view_manager.h"
 #include "components/guest_view/browser/guest_view_manager_delegate.h"
@@ skipping 82 matching lines @@
 
 void GuestViewMessageFilter::OnViewGarbageCollected(int view_instance_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   GetOrCreateGuestViewManager()->ViewGarbageCollected(render_process_id_,
                                                       view_instance_id);
 }
 
 void GuestViewMessageFilter::OnAttachGuest(
     int element_instance_id,
     int guest_instance_id,
+    int embedder_routing_id,
     const base::DictionaryValue& params) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   auto* manager = GuestViewManager::FromBrowserContext(browser_context_);
   // We should have a GuestViewManager at this point. If we don't then the
   // embedder is misbehaving.
   if (!manager)
     return;
 
-  manager->AttachGuest(render_process_id_,
-                       element_instance_id,
-                       guest_instance_id,
-                       params);
+  manager->AttachGuest(render_process_id_, embedder_routing_id,
+                       element_instance_id, guest_instance_id, params);
 }
 
 void GuestViewMessageFilter::OnAttachToEmbedderFrame(
     int embedder_local_render_frame_id,
     int element_instance_id,
     int guest_instance_id,
     const base::DictionaryValue& params) {
   auto* manager = GuestViewManager::FromBrowserContext(browser_context_);
   DCHECK(manager);
   content::WebContents* guest_web_contents =
@@ skipping 10 matching lines @@
 
   // Attach this inner WebContents |guest_web_contents| to the outer
   // WebContents |owner_web_contents|. The outer WebContents's
   // frame |embedder_frame| hosts the inner WebContents.
   guest_web_contents->AttachToOuterWebContentsFrame(owner_web_contents,
                                                     embedder_frame);
 
   // Update the guest manager about the attachment.
   // This sets up the embedder and guest pairing information inside
   // the manager.
-  manager->AttachGuest(render_process_id_, element_instance_id,
-                       guest_instance_id, params);
+  manager->AttachGuest(render_process_id_, embedder_local_render_frame_id,
+                       element_instance_id, guest_instance_id, params);
 
   owner_web_contents->GetMainFrame()->Send(
       new GuestViewMsg_AttachToEmbedderFrame_ACK(element_instance_id));
 
   guest->WillAttach(
       owner_web_contents, element_instance_id, false,
       base::Bind(&GuestViewMessageFilter::WillAttachCallback, this, guest));
 }
 
 void GuestViewMessageFilter::WillAttachCallback(GuestViewBase* guest) {
   guest->DidAttach(MSG_ROUTING_NONE);
 }
 
 }  // namespace guest_view