net: Move ownership of UploadDataStream from URLRequestHttpJob to URLRequest

chrome/browser/extensions/api/web_request/web_request_api.cc

 // Copyright (c) 2012 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/browser/extensions/api/web_request/web_request_api.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 34 matching lines @@
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/url_pattern.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/auth.h"
 #include "net/base/net_errors.h"
-#include "net/base/upload_data.h"
-#include "net/base/upload_element.h"
+#include "net/base/upload_data_stream.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::DictionaryValue;
 using base::ListValue;
 using base::StringValue;
 using chrome::VersionInfo;
 using content::BrowserMessageFilter;
 using content::BrowserThread;
@@ skipping 109 matching lines @@
   out->SetInteger(keys::kFrameIdKey, frame_id_for_extension);
   out->SetInteger(keys::kParentFrameIdKey, parent_frame_id_for_extension);
   out->SetInteger(keys::kTabIdKey, tab_id);
   out->SetString(keys::kTypeKey, helpers::ResourceTypeToString(resource_type));
   out->SetDouble(keys::kTimeStampKey, base::Time::Now().ToDoubleT() * 1000);
 }
 
 // Extracts the body from |request| and writes the data into |out|.
 void ExtractRequestInfoBody(const net::URLRequest* request,
                             DictionaryValue* out) {
-  const net::UploadData* upload_data = request->get_upload();
+  const net::UploadDataStream* upload_data = request->get_upload();
   if (!upload_data ||
       (request->method() != "POST" && request->method() != "PUT"))
     return;  // Need to exit without "out->Set(keys::kRequestBodyKey, ...);" .
 
   DictionaryValue* requestBody = new DictionaryValue();
   out->Set(keys::kRequestBodyKey, requestBody);
 
   // Get the data presenters, ordered by how specific they are.
   extensions::ParsedDataPresenter parsed_data_presenter(*request);
   extensions::RawDataPresenter raw_data_presenter;
   extensions::UploadDataPresenter* const presenters[] = {
     &parsed_data_presenter,    // 1: any parseable forms? (Specific to forms.)
     &raw_data_presenter        // 2: any data at all? (Non-specific.)
   };
   // Keys for the results of the corresponding presenters.
   static const char* const kKeys[] = {
     keys::kRequestBodyFormDataKey,
     keys::kRequestBodyRawKey
   };
 
-  const ScopedVector<net::UploadElement>& elements = upload_data->elements();
+  const ScopedVector<net::UploadElementReader>& readers =
+      upload_data->element_readers();
   bool some_succeeded = false;
   for (size_t i = 0; !some_succeeded && i < arraysize(presenters); ++i) {
-    ScopedVector<net::UploadElement>::const_iterator element;
-    for (element = elements.begin(); element != elements.end(); ++element)
-      presenters[i]->FeedNext(**element);
+    ScopedVector<net::UploadElementReader>::const_iterator reader;
+    for (reader = readers.begin(); reader != readers.end(); ++reader)
+      presenters[i]->FeedNext(**reader);
     if (presenters[i]->Succeeded()) {
       requestBody->Set(kKeys[i], presenters[i]->Result().release());
       some_succeeded = true;
     }
   }
   if (!some_succeeded)
     requestBody->SetString(keys::kRequestBodyErrorKey, "Unknown error.");
 }
 
 // Converts a HttpHeaders dictionary to a |name|, |value| pair. Returns
@@ skipping 1690 matching lines @@
       } else if ((*it)->name().find("AdBlock") != std::string::npos) {
         adblock = true;
       } else {
         other = true;
       }
     }
   }
 
   host->Send(new ExtensionMsg_UsingWebRequestAPI(adblock, adblock_plus, other));
 }