Split net::UploadData into two: for IPC and for upload handling

chrome/browser/policy/device_management_service_browsertest.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 "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "chrome/browser/policy/cloud_policy_constants.h"
 #include "chrome/browser/policy/device_management_service.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 32 matching lines @@
   // net::URLRequest::Interceptor overrides.
   virtual net::URLRequestJob* MaybeIntercept(
       net::URLRequest* request) OVERRIDE {
     em::DeviceManagementRequest dm_request;
     net::UploadData* upload = request->get_upload_mutable();
     if (request->url().GetOrigin() == service_url_.GetOrigin() &&
         request->url().path() == service_url_.path() &&
         upload != NULL &&
         upload->elements()->size() == 1) {
       std::string response_data;
-      ConstructResponse(upload->elements()->at(0).bytes(), &response_data);
+      ConstructResponse(upload->elements()->at(0).bytes(),
+                        upload->elements()->at(0).bytes_length(),
+                        &response_data);
       return new net::URLRequestTestJob(request,
                                         net::URLRequestTestJob::test_headers(),
                                         response_data,
                                         true);
     }
 
     return NULL;
   }
 
  private:
-  void ConstructResponse(const std::vector<char>& request_data,
+  void ConstructResponse(const void* request_data,

[darin (slow to review), 2012/08/15 17:49:55]

nit: |const char*| instead since that's what UploadData::Element::bytes()
returns?

[kinuko, 2012/08/16 08:14:59]

Done.

+                         uint64 request_data_length,
                          std::string* response_data) {
     em::DeviceManagementRequest request;
-    ASSERT_TRUE(request.ParseFromArray(vector_as_array(&request_data),
-                                       request_data.size()));
+    ASSERT_TRUE(request.ParseFromArray(request_data, request_data_length));
     em::DeviceManagementResponse response;
     if (request.has_register_request()) {
       response.mutable_register_response()->set_device_management_token(
           "fake_token");
     } else if (request.has_unregister_request()) {
       response.mutable_unregister_response();
     } else if (request.has_policy_request()) {
       response.mutable_policy_response()->add_response();
     } else if (request.has_auto_enrollment_request()) {
       response.mutable_auto_enrollment_response();
@@ skipping 127 matching lines @@
   MessageLoop::current()->Run();
 }
 
 INSTANTIATE_TEST_CASE_P(
     DeviceManagementServiceIntegrationTestInstance,
     DeviceManagementServiceIntegrationTest,
     testing::Values(&DeviceManagementServiceIntegrationTest::InitCannedResponse,
                     &DeviceManagementServiceIntegrationTest::InitTestServer));
 
 }  // namespace policy