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 <list> | 5 #include <list> |
6 #include <set> | 6 #include <set> |
7 | 7 |
8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 prerender::PrerenderTracker* prerender_tracker, | 230 prerender::PrerenderTracker* prerender_tracker, |
231 TestNavigationListener* test_navigation_listener) | 231 TestNavigationListener* test_navigation_listener) |
232 : ChromeResourceDispatcherHostDelegate(prerender_tracker), | 232 : ChromeResourceDispatcherHostDelegate(prerender_tracker), |
233 test_navigation_listener_(test_navigation_listener) { | 233 test_navigation_listener_(test_navigation_listener) { |
234 } | 234 } |
235 virtual ~TestResourceDispatcherHostDelegate() {} | 235 virtual ~TestResourceDispatcherHostDelegate() {} |
236 | 236 |
237 virtual void RequestBeginning( | 237 virtual void RequestBeginning( |
238 net::URLRequest* request, | 238 net::URLRequest* request, |
239 content::ResourceContext* resource_context, | 239 content::ResourceContext* resource_context, |
| 240 appcache::AppCacheService* appcache_service, |
240 ResourceType::Type resource_type, | 241 ResourceType::Type resource_type, |
241 int child_id, | 242 int child_id, |
242 int route_id, | 243 int route_id, |
243 bool is_continuation_of_transferred_request, | 244 bool is_continuation_of_transferred_request, |
244 ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE { | 245 ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE { |
245 ChromeResourceDispatcherHostDelegate::RequestBeginning( | 246 ChromeResourceDispatcherHostDelegate::RequestBeginning( |
246 request, | 247 request, |
247 resource_context, | 248 resource_context, |
| 249 appcache_service, |
248 resource_type, | 250 resource_type, |
249 child_id, | 251 child_id, |
250 route_id, | 252 route_id, |
251 is_continuation_of_transferred_request, | 253 is_continuation_of_transferred_request, |
252 throttles); | 254 throttles); |
253 content::ResourceThrottle* throttle = | 255 content::ResourceThrottle* throttle = |
254 test_navigation_listener_->CreateResourceThrottle(request->url(), | 256 test_navigation_listener_->CreateResourceThrottle(request->url(), |
255 resource_type); | 257 resource_type); |
256 if (throttle) | 258 if (throttle) |
257 throttles->push_back(throttle); | 259 throttles->push_back(throttle); |
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
649 test_server()->GetURL("test6"), | 651 test_server()->GetURL("test6"), |
650 "updateHistory()", | 652 "updateHistory()", |
651 extension->GetResourceURL("crossProcess/empty.html")); | 653 extension->GetResourceURL("crossProcess/empty.html")); |
652 | 654 |
653 ASSERT_TRUE(RunPageTest( | 655 ASSERT_TRUE(RunPageTest( |
654 extension->GetResourceURL("test_crossProcess.html").spec())) | 656 extension->GetResourceURL("test_crossProcess.html").spec())) |
655 << message_; | 657 << message_; |
656 } | 658 } |
657 | 659 |
658 } // namespace extensions | 660 } // namespace extensions |
OLD | NEW |