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

Side by Side Diff: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

Issue 481593002: Remove child/route parameters from ShouldBeginRequest and RequestBeginning. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android build Created 6 years, 4 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 | Annotate | Revision Log
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 <list> 5 #include <list>
6 #include <set> 6 #include <set>
7 7
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 : ChromeResourceDispatcherHostDelegate(prerender_tracker), 223 : ChromeResourceDispatcherHostDelegate(prerender_tracker),
224 test_navigation_listener_(test_navigation_listener) { 224 test_navigation_listener_(test_navigation_listener) {
225 } 225 }
226 virtual ~TestResourceDispatcherHostDelegate() {} 226 virtual ~TestResourceDispatcherHostDelegate() {}
227 227
228 virtual void RequestBeginning( 228 virtual void RequestBeginning(
229 net::URLRequest* request, 229 net::URLRequest* request,
230 content::ResourceContext* resource_context, 230 content::ResourceContext* resource_context,
231 content::AppCacheService* appcache_service, 231 content::AppCacheService* appcache_service,
232 ResourceType resource_type, 232 ResourceType resource_type,
233 int child_id,
234 int route_id,
235 ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE { 233 ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE {
236 ChromeResourceDispatcherHostDelegate::RequestBeginning( 234 ChromeResourceDispatcherHostDelegate::RequestBeginning(
237 request, 235 request,
238 resource_context, 236 resource_context,
239 appcache_service, 237 appcache_service,
240 resource_type, 238 resource_type,
241 child_id,
242 route_id,
243 throttles); 239 throttles);
244 content::ResourceThrottle* throttle = 240 content::ResourceThrottle* throttle =
245 test_navigation_listener_->CreateResourceThrottle(request->url(), 241 test_navigation_listener_->CreateResourceThrottle(request->url(),
246 resource_type); 242 resource_type);
247 if (throttle) 243 if (throttle)
248 throttles->push_back(throttle); 244 throttles->push_back(throttle);
249 } 245 }
250 246
251 private: 247 private:
252 scoped_refptr<TestNavigationListener> test_navigation_listener_; 248 scoped_refptr<TestNavigationListener> test_navigation_listener_;
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 "extensions/api_test/webnavigation/crash/b.html", 627 "extensions/api_test/webnavigation/crash/b.html",
632 embedded_test_server()->port())); 628 embedded_test_server()->port()));
633 ui_test_utils::NavigateToURL(browser(), url); 629 ui_test_utils::NavigateToURL(browser(), url);
634 630
635 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 631 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
636 } 632 }
637 633
638 #endif 634 #endif
639 635
640 } // namespace extensions 636 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698