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" |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 | 132 |
133 virtual ~ResourceSchedulerTest() { | 133 virtual ~ResourceSchedulerTest() { |
134 scheduler_.OnClientDeleted(kChildId, kRouteId); | 134 scheduler_.OnClientDeleted(kChildId, kRouteId); |
135 } | 135 } |
136 | 136 |
137 scoped_ptr<net::URLRequest> NewURLRequestWithRoute( | 137 scoped_ptr<net::URLRequest> NewURLRequestWithRoute( |
138 const char* url, | 138 const char* url, |
139 net::RequestPriority priority, | 139 net::RequestPriority priority, |
140 int route_id) { | 140 int route_id) { |
141 scoped_ptr<net::URLRequest> url_request( | 141 scoped_ptr<net::URLRequest> url_request( |
142 context_.CreateRequest(GURL(url), priority, NULL)); | 142 context_.CreateRequest(GURL(url), priority, NULL, NULL)); |
143 ResourceRequestInfoImpl* info = new ResourceRequestInfoImpl( | 143 ResourceRequestInfoImpl* info = new ResourceRequestInfoImpl( |
144 PROCESS_TYPE_RENDERER, // process_type | 144 PROCESS_TYPE_RENDERER, // process_type |
145 kChildId, // child_id | 145 kChildId, // child_id |
146 route_id, // route_id | 146 route_id, // route_id |
147 0, // origin_pid | 147 0, // origin_pid |
148 ++next_request_id_, // request_id | 148 ++next_request_id_, // request_id |
149 MSG_ROUTING_NONE, // render_frame_id | 149 MSG_ROUTING_NONE, // render_frame_id |
150 false, // is_main_frame | 150 false, // is_main_frame |
151 false, // parent_is_main_frame | 151 false, // parent_is_main_frame |
152 0, // parent_render_frame_id | 152 0, // parent_render_frame_id |
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
473 scheduler_.OnReceivedSpdyProxiedHttpResponse(kChildId, kRouteId); | 473 scheduler_.OnReceivedSpdyProxiedHttpResponse(kChildId, kRouteId); |
474 EXPECT_TRUE(request->started()); | 474 EXPECT_TRUE(request->started()); |
475 | 475 |
476 scoped_ptr<TestRequest> after(NewRequest("http://host/after", net::IDLE)); | 476 scoped_ptr<TestRequest> after(NewRequest("http://host/after", net::IDLE)); |
477 EXPECT_TRUE(after->started()); | 477 EXPECT_TRUE(after->started()); |
478 } | 478 } |
479 | 479 |
480 } // unnamed namespace | 480 } // unnamed namespace |
481 | 481 |
482 } // namespace content | 482 } // namespace content |
OLD | NEW |