Using thread safe reference counting to wrap the UploadData instance.Moving the post_data_len_ member variable to the PluginUrlRequest class.TEST=This is a tentative fix for bug 25531.BUG=25531

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

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

1 files changed, 20 insertions, 2 deletions

diff --git a/chrome_frame/plugin_url_request.cc b/chrome_frame/plugin_url_request.cc
index 1d34b0c..62a13f5 100644
--- a/chrome_frame/plugin_url_request.cc
+++ b/chrome_frame/plugin_url_request.cc
@@ -8,7 +8,7 @@
 #include "chrome_frame/np_browser_functions.h"
 
 PluginUrlRequest::PluginUrlRequest()
-    : request_handler_(NULL), tab_(0), remote_request_id_(0),
+    : request_handler_(NULL), tab_(0), remote_request_id_(0), post_data_len_(0),
       status_(URLRequestStatus::IO_PENDING),
       frame_busting_enabled_(false) {
 }
@@ -28,8 +28,26 @@ bool PluginUrlRequest::Initialize(PluginRequestHandler* request_handler,
   method_ = method;
   referrer_ = referrer;
   extra_headers_ = extra_headers;
-  upload_data_ = upload_data;
+
+  if (upload_data) {
+    // We store a pointer to UrlmonUploadDataStream and not net::UploadData
+    // since UrlmonUploadDataStream implements thread safe ref counting and
+    // UploadData does not.
+    CComObject<UrlmonUploadDataStream>* upload_stream = NULL;
+    HRESULT hr = CComObject<UrlmonUploadDataStream>::CreateInstance(
+        &upload_stream);
+    if (FAILED(hr)) {
+      NOTREACHED();
+    } else {
+      post_data_len_ = upload_data->GetContentLength();
+      upload_stream->AddRef();
+      upload_stream->Initialize(upload_data);
+      upload_data_.Attach(upload_stream);
+    }
+  }
+
   frame_busting_enabled_ = enable_frame_busting;
+
   return true;
 }