Stop using ScopedAllowIO in content::ResourceDispatcherHostImpl

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>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/alias.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/shared_memory.h"
 #include "base/stl_util.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
-#include "base/threading/thread_restrictions.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/cert_store_impl.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/cross_site_request_manager.h"
 #include "content/browser/download/download_file_manager.h"
 #include "content/browser/download/download_resource_handler.h"
 #include "content/browser/download/save_file_manager.h"
 #include "content/browser/download/save_file_resource_handler.h"
 #include "content/browser/fileapi/chrome_blob_storage_context.h"
 #include "content/browser/plugin_service_impl.h"
@@ skipping 916 matching lines @@
   }
 
   // TODO(darin): Do we really need all of these URLRequest setters in the
   // transferred navigation case?
 
   request->set_load_flags(load_flags);
 
   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();
   }
 
   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,
           route_id,
           request_data.origin_pid,
           request_id,
           request_data.is_main_frame,
           request_data.frame_id,
           request_data.parent_is_main_frame,
           request_data.parent_frame_id,
           request_data.resource_type,
           request_data.transition_type,
-          upload_size,
           false,  // is download
           allow_download,
           request_data.has_user_gesture,
           request_data.referrer_policy,
           resource_context);
   extra_info->AssociateWithRequest(request);  // Request takes ownership.
 
   if (request->url().SchemeIs(chrome::kBlobScheme)) {
     // Hang on to a reference to ensure the blob is not released prior
     // to the job being started.
@@ skipping 179 matching lines @@
       child_id,
       route_id,
       0,
       request_id_,
       false,     // is_main_frame
       -1,        // frame_id
       false,     // parent_is_main_frame
       -1,        // parent_frame_id
       ResourceType::SUB_RESOURCE,
       PAGE_TRANSITION_LINK,
-      0,         // upload_size
       download,  // is_download
       download,  // allow_download
       false,     // has_user_gesture
       WebKit::WebReferrerPolicyDefault,
       context);
 }
 
 void ResourceDispatcherHostImpl::OnSwapOutACK(
     const ViewMsg_SwapOut_Params& params) {
   // Closes for cross-site transitions are handled such that the cross-site
@@ skipping 386 matching lines @@
   LoadInfoMap info_map;
 
   LoaderMap::const_iterator i;
 
   // Determine the largest upload size of all requests
   // in each View (good chance it's zero).
   std::map<std::pair<int, int>, uint64> largest_upload_size;
   for (i = pending_loaders_.begin(); i != pending_loaders_.end(); ++i) {
     net::URLRequest* request = i->second->request();
     ResourceRequestInfoImpl* info = i->second->GetRequestInfo();
-    uint64 upload_size = info->GetUploadSize();
+    uint64 upload_size = request->GetUploadProgress().size;
     if (request->GetLoadState().state != net::LOAD_STATE_SENDING_REQUEST)
       upload_size = 0;
     std::pair<int, int> key(info->GetChildID(), info->GetRouteID());
     if (upload_size && largest_upload_size[key] < upload_size)
       largest_upload_size[key] = upload_size;
   }
 
   for (i = pending_loaders_.begin(); i != pending_loaders_.end(); ++i) {
     net::URLRequest* request = i->second->request();
     ResourceRequestInfoImpl* info = i->second->GetRequestInfo();
     net::LoadStateWithParam load_state = request->GetLoadState();
+    const net::UploadProgress progress = request->GetUploadProgress();

[darin (slow to review), 2012/08/29 22:36:16]

nit: no need for 'const' here.

[hashimoto, 2012/08/29 22:48:55]

Done.

 
     // We also poll for upload progress on this timer and send upload
     // progress ipc messages to the plugin process.
     i->second->ReportUploadProgress();
 
     std::pair<int, int> key(info->GetChildID(), info->GetRouteID());
 
     // If a request is uploading data, ignore all other requests so that the
     // upload progress takes priority for being shown in the status bar.
     if (largest_upload_size.find(key) != largest_upload_size.end() &&
-        info->GetUploadSize() < largest_upload_size[key])
+        progress.size < largest_upload_size[key])
       continue;
 
     net::LoadStateWithParam to_insert = load_state;
     LoadInfoMap::iterator existing = info_map.find(key);
     if (existing != info_map.end()) {
       to_insert =
           MoreInterestingLoadState(existing->second.load_state, load_state);
       if (to_insert.state == existing->second.load_state.state)
         continue;
     }
     LoadInfo& load_info = info_map[key];
     load_info.url = request->url();
     load_info.load_state = to_insert;
-    load_info.upload_size = info->GetUploadSize();
-    load_info.upload_position = request->GetUploadProgress();
+    load_info.upload_size = progress.size;
+    load_info.upload_position = progress.position;
   }
 
   if (info_map.empty())
     return;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&LoadInfoUpdateCallback, info_map));
 }
 
@@ skipping 85 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