Add the page url to plugin crashes to aid debugging.

chrome/plugin/npobject_proxy.cc

 // Copyright (c) 2006-2008 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 "chrome/plugin/npobject_proxy.h"
 
 #include "base/waitable_event.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/plugin/plugin_channel_base.h"
@@ skipping 31 matching lines @@
     proxy = wrapper->proxy;
   }
 
   return proxy;
 }
 
 NPObjectProxy::NPObjectProxy(
     PluginChannelBase* channel,
     int route_id,
     intptr_t npobject_ptr,
-    base::WaitableEvent* modal_dialog_event)
+    base::WaitableEvent* modal_dialog_event,
+    const GURL& page_url)
     : channel_(channel),
       route_id_(route_id),
       npobject_ptr_(npobject_ptr),
-      modal_dialog_event_(modal_dialog_event) {
+      modal_dialog_event_(modal_dialog_event),
+      page_url_(page_url) {
   channel_->AddRoute(route_id, this, true);
 }
 
 NPObjectProxy::~NPObjectProxy() {
   if (channel_.get()) {
     Send(new NPObjectMsg_Release(route_id_));
     if (channel_.get())
       channel_->RemoveRoute(route_id_);
   }
 }
 
 NPObject* NPObjectProxy::Create(PluginChannelBase* channel,
                                 int route_id,
                                 intptr_t npobject_ptr,
-                                base::WaitableEvent* modal_dialog_event) {
+                                base::WaitableEvent* modal_dialog_event,
+                                const GURL& page_url) {
   NPObjectWrapper* obj = reinterpret_cast<NPObjectWrapper*>(
       NPN_CreateObject(0, &npclass_proxy_));
   obj->proxy = new NPObjectProxy(
-      channel, route_id, npobject_ptr, modal_dialog_event);
+      channel, route_id, npobject_ptr, modal_dialog_event, page_url);
 
   return reinterpret_cast<NPObject*>(obj);
 }
 
 bool NPObjectProxy::Send(IPC::Message* msg) {
   if (channel_.get())
     return channel_->Send(msg);
 
   delete msg;
   return false;
@@ skipping 73 matching lines @@
     CreateNPIdentifierParam(name, &name_param);
   }
 
   // Note: This instance can get destroyed in the context of
   // Send so addref the channel in this scope.
   scoped_refptr<PluginChannelBase> channel_copy = proxy->channel_;
   std::vector<NPVariant_Param> args_param;
   for (unsigned int i = 0; i < arg_count; ++i) {
     NPVariant_Param param;
     CreateNPVariantParam(
-        args[i], channel_copy, &param, false, proxy->modal_dialog_event_);
+        args[i], channel_copy, &param, false, proxy->modal_dialog_event_,
+        proxy->page_url_);
     args_param.push_back(param);
   }
 
   NPVariant_Param param_result;
   NPObjectMsg_Invoke* msg = new NPObjectMsg_Invoke(
       proxy->route_id_, is_default, name_param, args_param, &param_result,
       &result);
 
   // If we're in the plugin process and this invoke leads to a dialog box, the
   // plugin will hang the window hierarchy unless we pump the window message
   // queue while waiting for a reply.  We need to do this to simulate what
   // happens when everything runs in-process (while calling MessageBox window
   // messages are pumped).
   msg->set_pump_messages_event(proxy->modal_dialog_event_);
 
   base::WaitableEvent* modal_dialog_event_handle = proxy->modal_dialog_event_;
 
+  GURL page_url = proxy->page_url_;
   proxy->Send(msg);
 
   // Send may delete proxy.
   proxy = NULL;
 
   if (!result)
     return false;
 
   CreateNPVariant(
-      param_result, channel_copy, np_result, modal_dialog_event_handle);
+      param_result, channel_copy, np_result, modal_dialog_event_handle,
+      page_url);
   return true;
 }
 
 bool NPObjectProxy::NPHasProperty(NPObject *obj,
                                   NPIdentifier name) {
   bool result = false;
   NPObjectProxy* proxy = GetProxy(obj);
   if (!proxy) {
     return obj->_class->hasProperty(obj, name);
   }
@@ skipping 29 matching lines @@
   if (!proxy) {
     return obj->_class->getProperty(obj, name, np_result);
   }
 
   NPIdentifier_Param name_param;
   CreateNPIdentifierParam(name, &name_param);
 
   NPVariant_Param param;
   base::WaitableEvent* modal_dialog_event_handle = proxy->modal_dialog_event_;
   scoped_refptr<PluginChannelBase> channel(proxy->channel_);
+
+  GURL page_url = proxy->page_url_;
   proxy->Send(new NPObjectMsg_GetProperty(
       proxy->route_id(), name_param, &param, &result));
   // Send may delete proxy.
   proxy = NULL;
   if (!result)
     return false;
 
   CreateNPVariant(
-      param, channel.get(), np_result, modal_dialog_event_handle);
+      param, channel.get(), np_result, modal_dialog_event_handle, page_url);
 
   return true;
 }
 
 bool NPObjectProxy::NPSetProperty(NPObject *obj,
                                   NPIdentifier name,
                                   const NPVariant *value) {
   bool result = false;
   NPObjectProxy* proxy = GetProxy(obj);
   if (!proxy) {
     return obj->_class->setProperty(obj, name, value);
   }
 
   NPIdentifier_Param name_param;
   CreateNPIdentifierParam(name, &name_param);
 
   NPVariant_Param value_param;
   CreateNPVariantParam(
       *value, proxy->channel(), &value_param, false,
-      proxy->modal_dialog_event_);
+      proxy->modal_dialog_event_, proxy->page_url_);
 
   proxy->Send(new NPObjectMsg_SetProperty(
       proxy->route_id(), name_param, value_param, &result));
   // Send may delete proxy.
   proxy = NULL;
 
   return result;
 }
 
 bool NPObjectProxy::NPRemoveProperty(NPObject *obj,
@@ skipping 66 matching lines @@
 
   bool result = false;
 
   // Note: This instance can get destroyed in the context of
   // Send so addref the channel in this scope.
   scoped_refptr<PluginChannelBase> channel_copy = proxy->channel_;
   std::vector<NPVariant_Param> args_param;
   for (unsigned int i = 0; i < arg_count; ++i) {
     NPVariant_Param param;
     CreateNPVariantParam(
-        args[i], channel_copy, &param, false, proxy->modal_dialog_event_);
+        args[i], channel_copy, &param, false, proxy->modal_dialog_event_,
+        proxy->page_url_);
     args_param.push_back(param);
   }
 
   NPVariant_Param param_result;
   NPObjectMsg_Construct* msg = new NPObjectMsg_Construct(
       proxy->route_id_, args_param, &param_result, &result);
 
   // See comment in NPObjectProxy::NPInvokePrivate.
   msg->set_pump_messages_event(proxy->modal_dialog_event_);
 
   base::WaitableEvent* modal_dialog_event_handle = proxy->modal_dialog_event_;
 
+  GURL page_url = proxy->page_url_;
   proxy->Send(msg);
 
   // Send may delete proxy.
   proxy = NULL;
 
   if (!result)
     return false;
 
   CreateNPVariant(
-      param_result, channel_copy, np_result, modal_dialog_event_handle);
+      param_result, channel_copy, np_result, modal_dialog_event_handle,
+      page_url);
   return true;
 }
 
 bool NPObjectProxy::NPNEvaluate(NPP npp,
                                 NPObject *obj,
                                 NPString *script,
                                 NPVariant *result_var) {
   bool result = false;
   NPObjectProxy* proxy = GetProxy(obj);
   if (!proxy) {
@@ skipping 17 matching lines @@
                                                        script_str,
                                                        popups_allowed,
                                                        &result_param,
                                                        &result);
 
   // Please refer to the comments in NPObjectProxy::NPInvokePrivate for
   // the reasoning behind setting the pump messages event in the sync message.
   msg->set_pump_messages_event(proxy->modal_dialog_event_);
   scoped_refptr<PluginChannelBase> channel(proxy->channel_);
   base::WaitableEvent* modal_dialog_event_handle = proxy->modal_dialog_event_;
+
+  GURL page_url = proxy->page_url_;
   proxy->Send(msg);
   // Send may delete proxy.
   proxy = NULL;
   if (!result)
     return false;
 
   CreateNPVariant(
-      result_param, channel.get(), result_var, modal_dialog_event_handle);
+      result_param, channel.get(), result_var, modal_dialog_event_handle,
+      page_url);
   return true;
 }
 
 void NPObjectProxy::NPNSetException(NPObject *obj,
                                     const NPUTF8 *message) {
   NPObjectProxy* proxy = GetProxy(obj);
   if (!proxy) {
     return;
   }
 
   NPVariant_Param result_param;
   std::string message_str(message);
 
   proxy->Send(new NPObjectMsg_SetException(proxy->route_id(), message_str));
   // Send may delete proxy.
   proxy = NULL;
 }