Revert 152528 - Split net::UploadData into two: for resource request IPC and for upload handling

Introducing webkit_glue::ResourceRequestBody as a content-level abstraction corresponding to WebHTTPBody and as an alternative of net::UploadData in ResourceRequest.

This interface can contain content-level objects like Blob (or FileSystem URL in later patches) while net::UploadData should NOT.

This patch also removes Blob support in net::UploadData.

BUG=110119
TEST=existing tests

Review URL: https://chromiumcodereview.appspot.com/10834289

TBR=kinuko@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10831402

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

1 files changed, 4 insertions, 6 deletions

diff --git a/chrome/browser/policy/device_management_service_browsertest.cc b/chrome/browser/policy/device_management_service_browsertest.cc
index ff532ba..12e5ba5 100644
--- a/chrome/browser/policy/device_management_service_browsertest.cc
+++ b/chrome/browser/policy/device_management_service_browsertest.cc
@@ -50,9 +50,7 @@ class CannedResponseInterceptor : public net::URLRequest::Interceptor {
         upload != NULL &&
         upload->elements()->size() == 1) {
       std::string response_data;
-      ConstructResponse(upload->elements()->at(0).bytes(),
-                        upload->elements()->at(0).bytes_length(),
-                        &response_data);
+      ConstructResponse(upload->elements()->at(0).bytes(), &response_data);
       return new net::URLRequestTestJob(request,
                                         net::URLRequestTestJob::test_headers(),
                                         response_data,
@@ -63,11 +61,11 @@ class CannedResponseInterceptor : public net::URLRequest::Interceptor {
   }
 
  private:
-  void ConstructResponse(const char* request_data,
-                         uint64 request_data_length,
+  void ConstructResponse(const std::vector<char>& request_data,
                          std::string* response_data) {
     em::DeviceManagementRequest request;
-    ASSERT_TRUE(request.ParseFromArray(request_data, request_data_length));
+    ASSERT_TRUE(request.ParseFromArray(vector_as_array(&request_data),
+                                       request_data.size()));
     em::DeviceManagementResponse response;
     if (request.has_register_request()) {
       response.mutable_register_response()->set_device_management_token(