Get rid of net::LOAD_ENABLE_UPLOAD_PROGRESS.

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

 // 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 test fixture.
 GEN_INCLUDE(['net_internals_test.js']);
 
 // Anonymous namespace
 (function() {
 
@@ skipping 171 matching lines @@
 /**
  * Test case for a URLRequest. This includes custom formatting for load flags,
  * request/response HTTP headers, dependent sources, as well as basic
  * indentation and grouping.  Also makes sure that no extra event is logged
  * for finished sources when there's a logCreationTime.
  */
 function painterTestURLRequest() {
   var testCase = {};
   testCase.tickOffset = '1337911098446';
   testCase.logCreationTime = 1338864634013;
+  testCase.loadFlags = LoadFlag.MAIN_FRAME | LoadFlag.MAYBE_USER_GESTURE |
+                       LoadFlag.VERIFY_EV_CERT;

[mmenke, 2014/10/22 18:23:37]

Great to see this dependency on exact load flag values removed!

 
   testCase.logEntries = [
     {
       'phase': EventPhase.PHASE_BEGIN,
       'source': {
         'id': 146,
         'type': EventSourceType.URL_REQUEST
       },
       'time': '953534778',
       'type': EventType.REQUEST_ALIVE
     },
     {
       'params': {
-        'load_flags': 68222976,
+        'load_flags': testCase.loadFlags,
         'method': 'GET',
         'priority': 4,
         'url': 'http://www.google.com/'
       },
       'phase': EventPhase.PHASE_BEGIN,
       'source': {
         'id': 146,
         'type': EventSourceType.URL_REQUEST
       },
       'time': '953534792',
       'type': EventType.URL_REQUEST_START_JOB
     },
     {
       'phase': EventPhase.PHASE_END,
       'source': {
         'id': 146,
         'type': EventSourceType.URL_REQUEST
       },
       'time': '953534800',
       'type': EventType.URL_REQUEST_START_JOB
     },
     {
       'params': {
-        'load_flags': 68222976,
+        'load_flags': testCase.loadFlags,
         'method': 'GET',
         'priority': 4,
         'url': 'http://www.google.com/'
       },
       'phase': EventPhase.PHASE_BEGIN,
       'source': {
         'id': 146,
         'type': EventSourceType.URL_REQUEST
       },
       'time': '953534802',
@@ skipping 486 matching lines @@
         'type': EventSourceType.URL_REQUEST
       },
       'time': '953535567',
       'type': EventType.REQUEST_ALIVE
     }
   ];
 
   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' +
 '                            --> url = "http://www.google.com/"\n' +
 't=1338864633255 [st= 31]      HTTP_CACHE_GET_BACKEND  [dt=1]\n' +
 't=1338864633257 [st= 33]      HTTP_CACHE_OPEN_ENTRY  [dt=5]\n' +
 't=1338864633263 [st= 39]      HTTP_CACHE_ADD_TO_ENTRY  [dt=1]\n' +
 't=1338864633269 [st= 45]      HTTP_CACHE_READ_INFO  [dt=4]\n' +
 't=1338864633276 [st= 52]     +HTTP_STREAM_REQUEST  [dt=72]\n' +
 't=1338864633344 [st=120]        HTTP_STREAM_REQUEST_BOUND_TO_JOB\n' +
@@ skipping 131 matching lines @@
   return testCase;
 }
 
 /**
  * Tests the custom formatting of net_errors across several different event
  * types.
  */
 function painterTestNetError() {
   var testCase = {};
   testCase.tickOffset = '1337911098446';
+  testCase.loadFlags = LoadFlag.MAIN_FRAME | LoadFlag.MAYBE_USER_GESTURE |
+                       LoadFlag.VERIFY_EV_CERT;
 
   testCase.logEntries = [
     {
       'phase': EventPhase.PHASE_BEGIN,
       'source': {
         'id': 318,
         'type': EventSourceType.URL_REQUEST
       },
       'time': '953675448',
       'type': EventType.REQUEST_ALIVE
     },
     {
       'params': {
-        'load_flags': 68222976,
+        'load_flags': testCase.loadFlags,
         'method': 'GET',
         'priority': 4,
         'url': 'http://www.doesnotexistdomain.com/'
       },
       'phase': EventPhase.PHASE_BEGIN,
       'source': {
         'id': 318,
         'type': EventSourceType.URL_REQUEST
       },
       'time': '953675455',
       'type': EventType.URL_REQUEST_START_JOB
     },
     {
       'phase': EventPhase.PHASE_END,
       'source': {
         'id': 318,
         'type': EventSourceType.URL_REQUEST
       },
       'time': '953675460',
       'type': EventType.URL_REQUEST_START_JOB
     },
     {
       'params': {
-        'load_flags': 68222976,
+        'load_flags': testCase.loadFlags,
         'method': 'GET',
         'priority': 4,
         'url': 'http://www.doesnotexistdomain.com/'
       },
       'phase': EventPhase.PHASE_BEGIN,
       'source': {
         'id': 318,
         'type': EventSourceType.URL_REQUEST
       },
       'time': '953675460',
@@ skipping 114 matching lines @@
         'type': EventSourceType.URL_REQUEST
       },
       'time': '953675923',
       'type': EventType.REQUEST_ALIVE
     }
   ];
 
   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' +
 '                            --> url = "http://www.doesnotexistdomain.com/"\n' +
 't=1338864773915 [st= 21]      HTTP_CACHE_GET_BACKEND  [dt=0]\n' +
 't=1338864773915 [st= 21]      HTTP_CACHE_OPEN_ENTRY  [dt=1]\n' +
 '                              --> net_error = -2 (ERR_FAILED)\n' +
 't=1338864773917 [st= 23]      HTTP_CACHE_CREATE_ENTRY  [dt=2]\n' +
 't=1338864773919 [st= 25]      HTTP_CACHE_ADD_TO_ENTRY  [dt=1]\n' +
 't=1338864773920 [st= 26]      HTTP_STREAM_REQUEST  [dt=225]\n' +
@@ skipping 953 matching lines @@
   return testCase;
 }
 
 /**
  * Tests the formatting of a URL request that was just finishing up when
  * net-internals was opened.
  */
 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'
       },
       'phase': EventPhase.PHASE_BEGIN,
       'source': {
         'id': 318,
         'type': EventSourceType.URL_REQUEST
       },
       'time': '953675548',
@@ skipping 23 matching lines @@
         'id': 318,
         'type': EventSourceType.URL_REQUEST
       },
       'time': '953675923',
       'type': EventType.REQUEST_ALIVE
     }
   ];
 
   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' +
 '                          --> method = "GET"\n' +
 '                          --> url = "http://www.MagicPonyShopper.com"\n' +
 't=1338864774145 [st=151]   -HTTP_STREAM_REQUEST\n' +
 't=1338864774151 [st=157]   -URL_REQUEST_START_JOB\n' +
 't=1338864774369 [st=375] -REQUEST_ALIVE';
 
   return testCase;
@@ skipping 41 matching lines @@
 
   testCase.expectedText =
 't=  2 [st=  0] +REQUEST_ALIVE  [dt=789+]\n' +
 't=152 [st=150]    HTTP_STREAM_REQUEST  [dt=1]\n' +
 't=791 [st=789]';
 
   return testCase;
 }
 
 })();  // Anonymous namespace