Get rid of net::LOAD_ENABLE_UPLOAD_PROGRESS.

It's only used by Loader code.

BUG=426442

Review URL: https://codereview.chromium.org/669073003

Cr-Commit-Position: refs/heads/master@{#301110}

chrome/test/data/webui/net_internals/log_view_painter.js

@@ -189,6 +189,8 @@ function painterTestURLRequest() {
   var testCase = {};
   testCase.tickOffset = '1337911098446';
   testCase.logCreationTime = 1338864634013;
+  testCase.loadFlags = LoadFlag.MAIN_FRAME | LoadFlag.MAYBE_USER_GESTURE |
+                       LoadFlag.VERIFY_EV_CERT;
 
   testCase.logEntries = [
     {
@@ -202,7 +204,7 @@ function painterTestURLRequest() {
     },
     {
       'params': {
-        'load_flags': 68222976,
+        'load_flags': testCase.loadFlags,
         'method': 'GET',
         'priority': 4,
         'url': 'http://www.google.com/'
@@ -226,7 +228,7 @@ function painterTestURLRequest() {
     },
     {
       'params': {
-        'load_flags': 68222976,
+        'load_flags': testCase.loadFlags,
         'method': 'GET',
         'priority': 4,
         'url': 'http://www.google.com/'
@@ -733,15 +735,17 @@ function painterTestURLRequest() {
   testCase.expectedText =
 't=1338864633224 [st=  0] +REQUEST_ALIVE  [dt=789]\n' +
 't=1338864633238 [st= 14]    URL_REQUEST_START_JOB  [dt=8]\n' +
-'                            --> load_flags = 68222976 ' +
-    '(MAIN_FRAME | MAYBE_USER_GESTURE ' +
+'                            --> load_flags = ' +
+    testCase.loadFlags.toString() +
+    ' (MAIN_FRAME | MAYBE_USER_GESTURE ' +
     '| VERIFY_EV_CERT)\n' +
 '                            --> method = "GET"\n' +
 '                            --> priority = 4\n' +
 '                            --> url = "http://www.google.com/"\n' +
 't=1338864633248 [st= 24]   +URL_REQUEST_START_JOB  [dt=279]\n' +
-'                            --> load_flags = 68222976 ' +
-    '(MAIN_FRAME | MAYBE_USER_GESTURE ' +
+'                            --> load_flags = ' +
+    testCase.loadFlags.toString() +
+    ' (MAIN_FRAME | MAYBE_USER_GESTURE ' +
     '| VERIFY_EV_CERT)\n' +
 '                            --> method = "GET"\n' +
 '                            --> priority = 4\n' +
@@ -893,6 +897,8 @@ function painterTestURLRequestIncompleteFromLoadedLogSingleEvent() {
 function painterTestNetError() {
   var testCase = {};
   testCase.tickOffset = '1337911098446';
+  testCase.loadFlags = LoadFlag.MAIN_FRAME | LoadFlag.MAYBE_USER_GESTURE |
+                       LoadFlag.VERIFY_EV_CERT;
 
   testCase.logEntries = [
     {
@@ -906,7 +912,7 @@ function painterTestNetError() {
     },
     {
       'params': {
-        'load_flags': 68222976,
+        'load_flags': testCase.loadFlags,
         'method': 'GET',
         'priority': 4,
         'url': 'http://www.doesnotexistdomain.com/'
@@ -930,7 +936,7 @@ function painterTestNetError() {
     },
     {
       'params': {
-        'load_flags': 68222976,
+        'load_flags': testCase.loadFlags,
         'method': 'GET',
         'priority': 4,
         'url': 'http://www.doesnotexistdomain.com/'
@@ -1065,15 +1071,17 @@ function painterTestNetError() {
   testCase.expectedText =
 't=1338864773894 [st=  0] +REQUEST_ALIVE  [dt=475]\n' +
 't=1338864773901 [st=  7]    URL_REQUEST_START_JOB  [dt=5]\n' +
-'                            --> load_flags = 68222976 (' +
-        'MAIN_FRAME | MAYBE_USER_GESTURE ' +
+'                            --> load_flags = ' +
+        testCase.loadFlags.toString() +
+        ' (MAIN_FRAME | MAYBE_USER_GESTURE ' +
         '| VERIFY_EV_CERT)\n' +
 '                            --> method = "GET"\n' +
 '                            --> priority = 4\n' +
 '                            --> url = "http://www.doesnotexistdomain.com/"\n' +
 't=1338864773906 [st= 12]   +URL_REQUEST_START_JOB  [dt=245]\n' +
-'                            --> load_flags = 68222976 (' +
-        'MAIN_FRAME | MAYBE_USER_GESTURE ' +
+'                            --> load_flags = ' +
+        testCase.loadFlags.toString() +
+        ' (MAIN_FRAME | MAYBE_USER_GESTURE ' +
         '| VERIFY_EV_CERT)\n' +
 '                            --> method = "GET"\n' +
 '                            --> priority = 4\n' +
@@ -2047,11 +2055,13 @@ function painterTestSSLVersionFallback() {
 function painterTestInProgressURLRequest() {
   var testCase = {};
   testCase.tickOffset = '1337911098446';
+  testCase.loadFlags = LoadFlag.MAIN_FRAME | LoadFlag.MAYBE_USER_GESTURE |
+                       LoadFlag.VERIFY_EV_CERT;
 
   testCase.logEntries = [
     {
       'params': {
-        'load_flags': 68222976,
+        'load_flags': testCase.loadFlags,
         'load_state': LoadState.READING_RESPONSE,
         'method': 'GET',
         'url': 'http://www.MagicPonyShopper.com'
@@ -2095,8 +2105,9 @@ function painterTestInProgressURLRequest() {
 
   testCase.expectedText =
 't=1338864773994 [st=  0] +REQUEST_ALIVE  [dt=375]\n' +
-'                          --> load_flags = 68222976 ' +
-    '(MAIN_FRAME | MAYBE_USER_GESTURE ' +
+'                          --> load_flags = ' +
+    testCase.loadFlags.toString() +
+    ' (MAIN_FRAME | MAYBE_USER_GESTURE ' +
     '| VERIFY_EV_CERT)\n' +
 '                          --> load_state = ' + LoadState.READING_RESPONSE +
     ' (READING_RESPONSE)\n' +

content/browser/loader/resource_dispatcher_host_impl.cc

@@ -1219,6 +1219,7 @@ void ResourceDispatcherHostImpl::BeginRequest(
           allow_download,
           request_data.has_user_gesture,
           request_data.enable_load_timing,
+          request_data.enable_upload_progress,
           request_data.referrer_policy,
           request_data.visiblity_state,
           resource_context,
@@ -1448,6 +1449,7 @@ ResourceRequestInfoImpl* ResourceDispatcherHostImpl::CreateRequestInfo(
       download,  // allow_download
       false,     // has_user_gesture
       false,     // enable_load_timing
+      false,     // enable_upload_progress
       blink::WebReferrerPolicyDefault,
       blink::WebPageVisibilityStateVisible,
       context,

content/browser/loader/resource_loader.cc

@@ -159,7 +159,8 @@ void ResourceLoader::ReportUploadProgress() {
   bool too_much_time_passed = time_since_last > kOneSecond;
 
   if (is_finished || enough_new_progress || too_much_time_passed) {
-    if (request_->load_flags() & net::LOAD_ENABLE_UPLOAD_PROGRESS) {
+    ResourceRequestInfoImpl* info = GetRequestInfo();
+    if (info->is_upload_progress_enabled()) {
       handler_->OnUploadProgress(progress.position(), progress.size());
       waiting_for_upload_progress_ack_ = true;
     }

content/browser/loader/resource_request_info_impl.cc

@@ -49,6 +49,7 @@ void ResourceRequestInfo::AllocateForTesting(net::URLRequest* request,
           true,                              // allow_download
           false,                             // has_user_gesture
           false,                             // enable load timing
+          false,                             // enable upload progress
           blink::WebReferrerPolicyDefault,   // referrer_policy
           blink::WebPageVisibilityStateVisible,  // visibility_state
           context,                           // context
@@ -104,6 +105,7 @@ ResourceRequestInfoImpl::ResourceRequestInfoImpl(
     bool allow_download,
     bool has_user_gesture,
     bool enable_load_timing,
+    bool enable_upload_progress,
     blink::WebReferrerPolicy referrer_policy,
     blink::WebPageVisibilityState visibility_state,
     ResourceContext* context,

content/browser/loader/resource_request_info_impl.h

@@ -57,6 +57,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo,
       bool allow_download,
       bool has_user_gesture,
       bool enable_load_timing,
+      bool enable_upload_progress,
       blink::WebReferrerPolicy referrer_policy,
       blink::WebPageVisibilityState visibility_state,
       ResourceContext* context,
@@ -164,6 +165,8 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo,
 
   bool is_load_timing_enabled() const { return enable_load_timing_; }
 
+  bool is_upload_progress_enabled() const { return enable_upload_progress_; }
+
  private:
   FRIEND_TEST_ALL_PREFIXES(ResourceDispatcherHostTest,
                            DeletedFilterDetached);
@@ -188,6 +191,7 @@ class ResourceRequestInfoImpl : public ResourceRequestInfo,
   bool allow_download_;
   bool has_user_gesture_;
   bool enable_load_timing_;
+  bool enable_upload_progress_;
   bool was_ignored_by_handler_;
   bool counted_as_in_flight_request_;
   ResourceType resource_type_;

content/browser/loader/resource_scheduler_unittest.cc

@@ -187,6 +187,7 @@ class ResourceSchedulerTest : public testing::Test {
         true,                                    // allow_download
         false,                                   // has_user_gesture
         false,                                   // enable_load_timing
+        false,                                   // enable_upload_progress
         blink::WebReferrerPolicyDefault,         // referrer_policy
         blink::WebPageVisibilityStateVisible,    // visibility_state
         NULL,                                    // context

content/child/request_info.cc

@@ -23,6 +23,7 @@ RequestInfo::RequestInfo()
       fetch_request_mode(FETCH_REQUEST_MODE_NO_CORS),
       fetch_credentials_mode(FETCH_CREDENTIALS_MODE_OMIT),
       enable_load_timing(false),
+      enable_upload_progress(false),
       extra_data(NULL) {
 }
 

content/child/request_info.h

@@ -93,6 +93,9 @@ struct CONTENT_EXPORT RequestInfo {
   // True if load timing data should be collected for the request.
   bool enable_load_timing;
 
+  // True if upload progress should be available.
+  bool enable_upload_progress;
+
   // Extra data associated with this request.  We do not own this pointer.
   blink::WebURLRequest::ExtraData* extra_data;
 

content/child/resource_dispatcher.cc

@@ -132,6 +132,7 @@ IPCResourceLoaderBridge::IPCResourceLoaderBridge(
   request_.fetch_request_context_type = request_info.fetch_request_context_type;
   request_.fetch_frame_type = request_info.fetch_frame_type;
   request_.enable_load_timing = request_info.enable_load_timing;
+  request_.enable_upload_progress = request_info.enable_upload_progress;
 
   const RequestExtraData kEmptyData;
   const RequestExtraData* extra_data;

content/child/web_url_loader_impl.cc

@@ -441,9 +441,9 @@ void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
   request_info.first_party_for_cookies = request.firstPartyForCookies();
   request_info.referrer = referrer_url;
   request_info.headers = GetWebURLRequestHeaders(request);
-  ;
   request_info.load_flags = GetLoadFlagsForWebURLRequest(request);
   request_info.enable_load_timing = true;
+  request_info.enable_upload_progress = request.reportUploadProgress();
   // requestor_pid only needs to be non-zero if the request originates outside
   // the render process, so we can use requestorProcessID even for requests
   // from in-process plugins.

content/child/web_url_request_util.cc

@@ -197,8 +197,6 @@ int GetLoadFlagsForWebURLRequest(const blink::WebURLRequest& request) {
       NOTREACHED();
   }
 
-  if (request.reportUploadProgress())
-    load_flags |= net::LOAD_ENABLE_UPLOAD_PROGRESS;
   if (request.reportRawHeaders())
     load_flags |= net::LOAD_REPORT_RAW_HEADERS;
 

content/common/resource_messages.h

@@ -224,6 +224,9 @@ IPC_STRUCT_BEGIN(ResourceHostMsg_Request)
   // True if load timing data should be collected for request.
   IPC_STRUCT_MEMBER(bool, enable_load_timing)
 
+  // True if upload progress should be available for request.
+  IPC_STRUCT_MEMBER(bool, enable_upload_progress)
+
   // The routing id of the RenderFrame.
   IPC_STRUCT_MEMBER(int, render_frame_id)
 

content/public/child/request_peer.h

@@ -34,7 +34,7 @@ struct ResourceResponseInfo;
 class CONTENT_EXPORT RequestPeer {
  public:
   // Called as upload progress is made.
-  // note: only for requests with LOAD_ENABLE_UPLOAD_PROGRESS set
+  // note: only for requests with upload progress enabled.
   virtual void OnUploadProgress(uint64 position, uint64 size) = 0;
 
   // Called when a redirect occurs.  The implementation may return false to

net/base/load_flags_list.h

@@ -38,93 +38,90 @@ LOAD_FLAG(DISABLE_CACHE, 1 << 5)
 // URLRequest::Interceptors.
 LOAD_FLAG(DISABLE_INTERCEPT, 1 << 6)
 
-// If present, upload progress messages should be provided to initiator.
-LOAD_FLAG(ENABLE_UPLOAD_PROGRESS, 1 << 7)
-
 // If present, ignores certificate mismatches with the domain name.
 // (The default behavior is to trigger an OnSSLCertificateError callback.)
-LOAD_FLAG(IGNORE_CERT_COMMON_NAME_INVALID, 1 << 8)
+LOAD_FLAG(IGNORE_CERT_COMMON_NAME_INVALID, 1 << 7)
 
 // If present, ignores certificate expiration dates
 // (The default behavior is to trigger an OnSSLCertificateError callback).
-LOAD_FLAG(IGNORE_CERT_DATE_INVALID, 1 << 9)
+LOAD_FLAG(IGNORE_CERT_DATE_INVALID, 1 << 8)
 
 // If present, trusts all certificate authorities
 // (The default behavior is to trigger an OnSSLCertificateError callback).
-LOAD_FLAG(IGNORE_CERT_AUTHORITY_INVALID, 1 << 10)
+LOAD_FLAG(IGNORE_CERT_AUTHORITY_INVALID, 1 << 9)
 
 // If present, causes certificate revocation checks to be skipped on secure
 // connections.
-LOAD_FLAG(DISABLE_CERT_REVOCATION_CHECKING, 1 << 11)
+LOAD_FLAG(DISABLE_CERT_REVOCATION_CHECKING, 1 << 10)
 
 // If present, ignores wrong key usage of the certificate
 // (The default behavior is to trigger an OnSSLCertificateError callback).
-LOAD_FLAG(IGNORE_CERT_WRONG_USAGE, 1 << 12)
+LOAD_FLAG(IGNORE_CERT_WRONG_USAGE, 1 << 11)
 
 // This load will not make any changes to cookies, including storing new
 // cookies or updating existing ones.
-LOAD_FLAG(DO_NOT_SAVE_COOKIES, 1 << 13)
+LOAD_FLAG(DO_NOT_SAVE_COOKIES, 1 << 12)
 
 // Do not resolve proxies. This override is used when downloading PAC files
 // to avoid having a circular dependency.
-LOAD_FLAG(BYPASS_PROXY, 1 << 14)
+LOAD_FLAG(BYPASS_PROXY, 1 << 13)
 
 // Indicate this request is for a download, as opposed to viewing.
-LOAD_FLAG(IS_DOWNLOAD, 1 << 15)
+LOAD_FLAG(IS_DOWNLOAD, 1 << 14)
 
 // Requires EV certificate verification.
-LOAD_FLAG(VERIFY_EV_CERT, 1 << 16)
+LOAD_FLAG(VERIFY_EV_CERT, 1 << 15)
 
 // This load will not send any cookies.
-LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17)
+LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 16)
 
 // This load will not send authentication data (user name/password)
 // to the server (as opposed to the proxy).
-LOAD_FLAG(DO_NOT_SEND_AUTH_DATA, 1 << 18)
+LOAD_FLAG(DO_NOT_SEND_AUTH_DATA, 1 << 17)
 
 // This should only be used for testing (set by HttpNetworkTransaction).
-LOAD_FLAG(IGNORE_ALL_CERT_ERRORS, 1 << 19)
+LOAD_FLAG(IGNORE_ALL_CERT_ERRORS, 1 << 18)
 
 // Indicate that this is a top level frame, so that we don't assume it is a
 // subresource and speculatively pre-connect or pre-resolve when a referring
 // page is loaded.
-LOAD_FLAG(MAIN_FRAME, 1 << 20)
+LOAD_FLAG(MAIN_FRAME, 1 << 19)
 
 // Indicate that this is a sub frame, and hence it might have subresources that
 // should be speculatively resolved, or even speculatively preconnected.
-LOAD_FLAG(SUB_FRAME, 1 << 21)
+LOAD_FLAG(SUB_FRAME, 1 << 20)
 
 // If present, intercept actual request/response headers from network stack
 // and report them to renderer. This includes cookies, so the flag is only
 // respected if renderer has CanReadRawCookies capability in the security
 // policy.
-LOAD_FLAG(REPORT_RAW_HEADERS, 1 << 22)
+LOAD_FLAG(REPORT_RAW_HEADERS, 1 << 21)
 
 // Indicates that this load was motivated by the rel=prefetch feature,
 // and is (in theory) not intended for the current frame.
-LOAD_FLAG(PREFETCH, 1 << 23)
+LOAD_FLAG(PREFETCH, 1 << 22)
 
 // Indicates that this is a load that ignores limits and should complete
 // immediately.
-LOAD_FLAG(IGNORE_LIMITS, 1 << 24)
+LOAD_FLAG(IGNORE_LIMITS, 1 << 23)
 
 // Suppress login prompts for this request. Cached credentials or
 // default credentials may still be used for authentication.
-LOAD_FLAG(DO_NOT_PROMPT_FOR_LOGIN, 1 << 25)
+LOAD_FLAG(DO_NOT_PROMPT_FOR_LOGIN, 1 << 24)
 
 // Indicates that the operation is somewhat likely to be due to an
 // explicit user action. This can be used as a hint to treat the
 // request with higher priority.
-LOAD_FLAG(MAYBE_USER_GESTURE, 1 << 26)
+LOAD_FLAG(MAYBE_USER_GESTURE, 1 << 25)
 
 // Indicates that the username:password portion of the URL should not
 // be honored, but that other forms of authority may be used.
-LOAD_FLAG(DO_NOT_USE_EMBEDDED_IDENTITY, 1 << 27)
+LOAD_FLAG(DO_NOT_USE_EMBEDDED_IDENTITY, 1 << 26)
 
 // Send request directly to the origin if the effective proxy is the data
 // reduction proxy.
 // TODO(rcs): Remove this flag as soon as http://crbug.com/339237 is resolved.
-LOAD_FLAG(BYPASS_DATA_REDUCTION_PROXY, 1 << 28)
+LOAD_FLAG(BYPASS_DATA_REDUCTION_PROXY, 1 << 27)
 
 // Indicates the the request is an asynchronous revalidation.
-LOAD_FLAG(ASYNC_REVALIDATION, 1 << 29)
+LOAD_FLAG(ASYNC_REVALIDATION, 1 << 28)