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

Side by Side Diff: content/browser/loader/resource_scheduler_unittest.cc

Issue 680583002: Revert "Get rid of net::LOAD_ENABLE_UPLOAD_PROGRESS." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
« no previous file with comments | « content/browser/loader/resource_request_info_impl.cc ('k') | content/child/request_info.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/loader/resource_scheduler.h" 5 #include "content/browser/loader/resource_scheduler.h"
6 6
7 #include "base/memory/scoped_vector.h" 7 #include "base/memory/scoped_vector.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 false, // parent_is_main_frame 180 false, // parent_is_main_frame
181 0, // parent_render_frame_id 181 0, // parent_render_frame_id
182 RESOURCE_TYPE_SUB_RESOURCE, // resource_type 182 RESOURCE_TYPE_SUB_RESOURCE, // resource_type
183 ui::PAGE_TRANSITION_LINK, // transition_type 183 ui::PAGE_TRANSITION_LINK, // transition_type
184 false, // should_replace_current_entry 184 false, // should_replace_current_entry
185 false, // is_download 185 false, // is_download
186 false, // is_stream 186 false, // is_stream
187 true, // allow_download 187 true, // allow_download
188 false, // has_user_gesture 188 false, // has_user_gesture
189 false, // enable_load_timing 189 false, // enable_load_timing
190 false, // enable_upload_progress
191 blink::WebReferrerPolicyDefault, // referrer_policy 190 blink::WebReferrerPolicyDefault, // referrer_policy
192 blink::WebPageVisibilityStateVisible, // visibility_state 191 blink::WebPageVisibilityStateVisible, // visibility_state
193 NULL, // context 192 NULL, // context
194 base::WeakPtr<ResourceMessageFilter>(), // filter 193 base::WeakPtr<ResourceMessageFilter>(), // filter
195 is_async); // is_async 194 is_async); // is_async
196 info->AssociateWithRequest(url_request.get()); 195 info->AssociateWithRequest(url_request.get());
197 return url_request.Pass(); 196 return url_request.Pass();
198 } 197 }
199 198
200 scoped_ptr<net::URLRequest> NewURLRequest(const char* url, 199 scoped_ptr<net::URLRequest> NewURLRequest(const char* url,
(...skipping 2003 matching lines...) Expand 10 before | Expand all | Expand 10 after
2204 web_contents_2.reset(); 2203 web_contents_2.reset();
2205 base::RunLoop().RunUntilIdle(); 2204 base::RunLoop().RunUntilIdle();
2206 2205
2207 browser_context.reset(); 2206 browser_context.reset();
2208 render_process_host_factory.reset(); 2207 render_process_host_factory.reset();
2209 } 2208 }
2210 2209
2211 } // unnamed namespace 2210 } // unnamed namespace
2212 2211
2213 } // namespace content 2212 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/loader/resource_request_info_impl.cc ('k') | content/child/request_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698