Track NPObject ownership by the originating plugins' NPP identifier. [4/6] (Chrome)

content/plugin/webplugin_proxy.cc

Index: content/plugin/webplugin_proxy.cc
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc
index 65a8505f2bc0c8f78fb6dc9814068159f411bef8..8afbfb097cdcfc63468b9ff6c4a2d7ed1d54fdad 100644
--- a/content/plugin/webplugin_proxy.cc
+++ b/content/plugin/webplugin_proxy.cc
@@ -220,10 +220,15 @@ NPObject* WebPluginProxy::GetWindowScriptNPObject() {
   if (!success)
     return NULL;
 
+  // PluginChannel creates a dummy owner identifier for unknown owners, so
+  // use that.
+  NPP owner = channel_->GetExistingNPObjectOwner(MSG_ROUTING_NONE);
+
   window_npobject_ = NPObjectProxy::Create(channel_.get(),
                                            npobject_route_id,
                                            host_render_view_routing_id_,
-                                           page_url_);
+                                           page_url_,
+                                           owner);
 
   return window_npobject_;
 }
@@ -239,10 +244,15 @@ NPObject* WebPluginProxy::GetPluginElement() {
   if (!success)
     return NULL;
 
+  // PluginChannel creates a dummy owner identifier for unknown owners, so
+  // use that.
+  NPP owner = channel_->GetExistingNPObjectOwner(MSG_ROUTING_NONE);
+
   plugin_element_ = NPObjectProxy::Create(channel_.get(),
                                           npobject_route_id,
                                           host_render_view_routing_id_,
-                                          page_url_);
+                                          page_url_,
+                                          owner);
 
   return plugin_element_;
 }