Allow MimeHandlerViewGuest be embedded inside OOPIFs

components/guest_view/browser/guest_view_manager.h

 // 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.
 
 #ifndef COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_MANAGER_H_
 #define COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_MANAGER_H_
 
 #include <map>
 #include <memory>
 #include <set>
@@ skipping 44 matching lines @@
   }
   // Returns the guest WebContents associated with the given |guest_instance_id|
   // if the provided |embedder_render_process_id| is allowed to access it.
   // If the embedder is not allowed access, the embedder will be killed, and
   // this method will return NULL. If no WebContents exists with the given
   // instance ID, then NULL will also be returned.
   content::WebContents* GetGuestByInstanceIDSafely(
       int guest_instance_id,
       int embedder_render_process_id);
 
-  // Associates the Browser Plugin with |element_instance_id| to a
-  // guest that has ID of |guest_instance_id| and sets initialization
-  // parameters, |params| for it.
+  // Associates the Browser Plugin with |element_instance_id| to a guest that
+  // has ID of |guest_instance_id| and sets initialization parameters, |params|
+  // for it. The embedder frame is identified by the pair of
+  // |embedder_process_id| and |embedder_routing_id|.
   void AttachGuest(int embedder_process_id,
+                   int embedder_routing_id,
                    int element_instance_id,
                    int guest_instance_id,
                    const base::DictionaryValue& attach_params);
 
   // Removes the association between |element_instance_id| and a guest instance
   // ID if one exists.
   void DetachGuest(GuestViewBase* guest);
 
   // Indicates whether the |guest| is owned by an extension or Chrome App.
   bool IsOwnedByExtension(GuestViewBase* guest);
@@ skipping 180 matching lines @@
   // This tracks which GuestView embedders are currently being observed.
   std::set<int> embedders_observed_;
 
   // |view_destruction_callback_map_| maps from embedder process ID to view ID
   // to a vector of callback functions to be called when that view is destroyed.
   using Callbacks = std::vector<base::Closure>;
   using CallbacksForEachViewID = std::map<int, Callbacks>;
   using CallbacksForEachEmbedderID = std::map<int, CallbacksForEachViewID>;
   CallbacksForEachEmbedderID view_destruction_callback_map_;
 
+  // The routing ID of the embedder which most recently sent an attach request.
+  // We use this value to later identify the RenderFrameHost and WebContents
+  // which embed the guest. This is mainly used for MimeHandlerViewGuest and
+  // specifically when the guest is embedded inside a cross origin frame.
+  int attaching_guest_embedder_routing_id_;

[Charlie Reis, 2016/10/18 22:52:20]

Routing IDs can only be used in conjunction with a process ID-- they're not safe
otherwise, since they can conflict with routing IDs from another process.  Where
is the process ID corresponding to this?

[EhsanK, 2016/10/20 21:41:17]

It comes later when the attach request arrives (which also provides this
routing_id). But it is removed in the newest patch.

I needed this to pair up the routing ID with the process ID of the frame sending
the message. I noticed that there is a better place to do this where both ids
come together and we already use it to create the MimeHandlerViewGuest. I have
left a comment there (in extensions_guest_view_message_filter.cc).

+
   // This is used to ensure that an EmbedderRenderProcessHostObserver will not
   // call into this GuestViewManager after it has been destroyed.
   base::WeakPtrFactory<GuestViewManager> weak_ptr_factory_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GuestViewManager);
 };
 
 }  // namespace guest_view
 
 #endif  // COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_MANAGER_H_