Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: chrome/browser/policy/device_management_service_browsertest.cc

Issue 10834289: Split net::UploadData into two: for IPC and for upload handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase + moved ResolveBlobRef from webkit_blob to webkit_glue Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/renderer_host/resource_dispatcher_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/device_management_service_browsertest.cc
diff --git a/chrome/browser/policy/device_management_service_browsertest.cc b/chrome/browser/policy/device_management_service_browsertest.cc
index 12e5ba52aa14f2bd61ad8a688b8aa24661dff439..ff532ba2d088a93a28fffc0f5b89c39b112aa876 100644
--- a/chrome/browser/policy/device_management_service_browsertest.cc
+++ b/chrome/browser/policy/device_management_service_browsertest.cc
@@ -50,7 +50,9 @@ class CannedResponseInterceptor : public net::URLRequest::Interceptor {
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,
@@ -61,11 +63,11 @@ class CannedResponseInterceptor : public net::URLRequest::Interceptor {
}
private:
- void ConstructResponse(const std::vector<char>& request_data,
+ void ConstructResponse(const char* request_data,
+ 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(
« no previous file with comments | « no previous file | content/browser/renderer_host/resource_dispatcher_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698