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/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "content/browser/browser_thread_impl.h" | 10 #include "content/browser/browser_thread_impl.h" |
11 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 11 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
12 #include "content/browser/loader/resource_message_filter.h" | 12 #include "content/browser/loader/resource_message_filter.h" |
13 #include "content/browser/loader/resource_request_info_impl.h" | 13 #include "content/browser/loader/resource_request_info_impl.h" |
14 #include "content/common/resource_messages.h" | 14 #include "content/common/resource_messages.h" |
15 #include "content/public/browser/resource_context.h" | 15 #include "content/public/browser/resource_context.h" |
16 #include "content/public/browser/resource_controller.h" | 16 #include "content/public/browser/resource_controller.h" |
17 #include "content/public/browser/resource_throttle.h" | 17 #include "content/public/browser/resource_throttle.h" |
18 #include "content/public/common/process_type.h" | 18 #include "content/public/common/process_type.h" |
19 #include "net/base/host_port_pair.h" | 19 #include "net/base/host_port_pair.h" |
| 20 #include "net/base/request_priority.h" |
20 #include "net/http/http_server_properties_impl.h" | 21 #include "net/http/http_server_properties_impl.h" |
21 #include "net/url_request/url_request.h" | 22 #include "net/url_request/url_request.h" |
22 #include "net/url_request/url_request_test_util.h" | 23 #include "net/url_request/url_request_test_util.h" |
23 #include "testing/gtest/include/gtest/gtest.h" | 24 #include "testing/gtest/include/gtest/gtest.h" |
24 #include "webkit/common/resource_type.h" | 25 #include "webkit/common/resource_type.h" |
25 | 26 |
26 namespace content { | 27 namespace content { |
27 | 28 |
28 namespace { | 29 namespace { |
29 | 30 |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 | 133 |
133 virtual ~ResourceSchedulerTest() { | 134 virtual ~ResourceSchedulerTest() { |
134 scheduler_.OnClientDeleted(kChildId, kRouteId); | 135 scheduler_.OnClientDeleted(kChildId, kRouteId); |
135 } | 136 } |
136 | 137 |
137 scoped_ptr<net::URLRequest> NewURLRequestWithRoute( | 138 scoped_ptr<net::URLRequest> NewURLRequestWithRoute( |
138 const char* url, | 139 const char* url, |
139 net::RequestPriority priority, | 140 net::RequestPriority priority, |
140 int route_id) { | 141 int route_id) { |
141 scoped_ptr<net::URLRequest> url_request( | 142 scoped_ptr<net::URLRequest> url_request( |
142 context_.CreateRequest(GURL(url), NULL)); | 143 context_.CreateRequest(GURL(url), priority, NULL)); |
143 url_request->SetPriority(priority); | |
144 ResourceRequestInfoImpl* info = new ResourceRequestInfoImpl( | 144 ResourceRequestInfoImpl* info = new ResourceRequestInfoImpl( |
145 PROCESS_TYPE_RENDERER, // process_type | 145 PROCESS_TYPE_RENDERER, // process_type |
146 kChildId, // child_id | 146 kChildId, // child_id |
147 route_id, // route_id | 147 route_id, // route_id |
148 0, // origin_pid | 148 0, // origin_pid |
149 ++next_request_id_, // request_id | 149 ++next_request_id_, // request_id |
150 false, // is_main_frame | 150 false, // is_main_frame |
151 0, // frame_id | 151 0, // frame_id |
152 false, // parent_is_main_frame | 152 false, // parent_is_main_frame |
153 0, // parent_frame_id | 153 0, // parent_frame_id |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
437 scoped_ptr<TestRequest> low(NewRequest("http://host/high", net::LOWEST)); | 437 scoped_ptr<TestRequest> low(NewRequest("http://host/high", net::LOWEST)); |
438 | 438 |
439 scoped_ptr<TestRequest> request( | 439 scoped_ptr<TestRequest> request( |
440 NewRequest("chrome-extension://req", net::LOWEST)); | 440 NewRequest("chrome-extension://req", net::LOWEST)); |
441 EXPECT_TRUE(request->started()); | 441 EXPECT_TRUE(request->started()); |
442 } | 442 } |
443 | 443 |
444 } // unnamed namespace | 444 } // unnamed namespace |
445 | 445 |
446 } // namespace content | 446 } // namespace content |
OLD | NEW |