Fix a crash whereby a non-thread-safe ref-counted net::UploadData is used between threads. This patch does this by wrapping the UploadData structure in a thread-safe container for use between threads.

BUG=39453
TEST=none

Review URL: http://codereview.chromium.org/1508012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43287 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 2 deletions

diff --git a/chrome_frame/npapi_url_request.cc b/chrome_frame/npapi_url_request.cc
index c71659a..f928327 100644
--- a/chrome_frame/npapi_url_request.cc
+++ b/chrome_frame/npapi_url_request.cc
@@ -198,12 +198,13 @@ bool NPAPIUrlRequestManager::IsThreadSafe() {
 }
 
 void NPAPIUrlRequestManager::StartRequest(int request_id,
-    const IPC::AutomationURLRequest& request_info) {
+    const ThreadSafeAutomationUrlRequest& request_info) {
   scoped_refptr<NPAPIUrlRequest> new_request(new NPAPIUrlRequest(instance_));
   DCHECK(new_request);
   if (new_request->Initialize(this, request_id, request_info.url,
         request_info.method, request_info.referrer,
-        request_info.extra_request_headers, request_info.upload_data.get(),
+        request_info.extra_request_headers,
+        request_info.upload_data.get()->get_data(),
         enable_frame_busting_)) {
     // Add to map.
     DCHECK(request_map_.find(request_id) == request_map_.end());