| OLD | NEW |
| 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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 false, // is_stream | 190 false, // is_stream |
| 191 true, // allow_download | 191 true, // allow_download |
| 192 false, // has_user_gesture | 192 false, // has_user_gesture |
| 193 false, // enable_load_timing | 193 false, // enable_load_timing |
| 194 false, // enable_upload_progress | 194 false, // enable_upload_progress |
| 195 false, // do_not_prompt_for_login | 195 false, // do_not_prompt_for_login |
| 196 blink::WebReferrerPolicyDefault, // referrer_policy | 196 blink::WebReferrerPolicyDefault, // referrer_policy |
| 197 blink::WebPageVisibilityStateVisible, // visibility_state | 197 blink::WebPageVisibilityStateVisible, // visibility_state |
| 198 NULL, // context | 198 NULL, // context |
| 199 base::WeakPtr<ResourceMessageFilter>(), // filter | 199 base::WeakPtr<ResourceMessageFilter>(), // filter |
| 200 is_async); // is_async | 200 is_async, // is_async |
| 201 false, // is_async_revalidation |
| 202 NULL); // original_message |
| 201 info->AssociateWithRequest(url_request.get()); | 203 info->AssociateWithRequest(url_request.get()); |
| 202 return url_request.Pass(); | 204 return url_request.Pass(); |
| 203 } | 205 } |
| 204 | 206 |
| 205 scoped_ptr<net::URLRequest> NewURLRequest(const char* url, | 207 scoped_ptr<net::URLRequest> NewURLRequest(const char* url, |
| 206 net::RequestPriority priority) { | 208 net::RequestPriority priority) { |
| 207 return NewURLRequestWithChildAndRoute( | 209 return NewURLRequestWithChildAndRoute( |
| 208 url, priority, kChildId, kRouteId, true); | 210 url, priority, kChildId, kRouteId, true); |
| 209 } | 211 } |
| 210 | 212 |
| (...skipping 1998 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2209 web_contents_2.reset(); | 2211 web_contents_2.reset(); |
| 2210 base::RunLoop().RunUntilIdle(); | 2212 base::RunLoop().RunUntilIdle(); |
| 2211 | 2213 |
| 2212 browser_context.reset(); | 2214 browser_context.reset(); |
| 2213 render_process_host_factory.reset(); | 2215 render_process_host_factory.reset(); |
| 2214 } | 2216 } |
| 2215 | 2217 |
| 2216 } // unnamed namespace | 2218 } // unnamed namespace |
| 2217 | 2219 |
| 2218 } // namespace content | 2220 } // namespace content |
| OLD | NEW |