net: Move file operation code from UploadData to UploadDataStream

content/browser/renderer_host/resource_dispatcher_host_impl.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
 
 #include <set>
 #include <vector>
@@ skipping 51 matching lines @@
 #include "content/public/common/process_type.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/auth.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/load_flags.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/base/request_priority.h"
 #include "net/base/ssl_cert_request_info.h"
-#include "net/base/upload_data.h"
+#include "net/base/upload_data_stream.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "webkit/appcache/appcache_interceptor.h"
 #include "webkit/appcache/appcache_interfaces.h"
@@ skipping 875 matching lines @@
   request->set_priority(DetermineRequestPriority(request_data.resource_type));
 
   // Resolve elements from request_body and prepare upload data.
   uint64 upload_size = 0;
   if (request_data.request_body) {
     request->set_upload(
         request_data.request_body->ResolveElementsAndCreateUploadData(
             GetBlobStorageControllerForResourceContext(resource_context)));
     // This results in performing file IO. crbug.com/112607.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
-    upload_size = request->get_upload_mutable()->GetContentLengthSync();
+    net::UploadDataStream upload_stream(request->get_upload_mutable());
+    if (upload_stream.Init() == net::OK)

[willchan no longer on Chromium, 2012/08/28 23:45:22]

I'm concerned about calling Init() here. Doesn't that have side effects? Do we
really want to be doing that all the time? It looks like it resets the offsets
in the elements. I guess that's fine here, but in the webkit
SimpleResourceLoaderBridge where we're just getting upload progress, isn't
resetting offsets wrong?

[hashimoto, 2012/08/28 23:49:56]

You're right.  Resetting offsets here is wrong.
We can get rid of this code once GetUploadProgress starts returning the upload
size (http://codereview.chromium.org/10825073/ is still waiting for darin's
review)
Let's submit this change after that.

While waiting for darin's review, could you take a look at other parts?
Thanks,

[willchan no longer on Chromium, 2012/08/28 23:59:36]

I read everything else already. That was my only concern.

+      upload_size = upload_stream.size();
   }
 
   bool allow_download = request_data.allow_download &&
       ResourceType::IsFrame(request_data.resource_type);
 
   // Make extra info and read footer (contains request ID).
   ResourceRequestInfoImpl* extra_info =
       new ResourceRequestInfoImpl(
           process_type,
           child_id,
@@ skipping 749 matching lines @@
 
   return i->second.get();
 }
 
 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id,
                                                       int request_id) const {
   return GetLoader(GlobalRequestID(child_id, request_id));
 }
 
 }  // namespace content