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

Unified Diff: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

Issue 2535723005: Stop using ResourceController in ResourceThrottle (Closed)
Patch Set: Addressed #62 Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
index c1bbaf1572d4ed25c4e3947bbac14b6e24a36195..ed9baeb9fe8149e7499dd82ebc6aa6e26ac35292 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
@@ -37,7 +37,6 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/render_widget_host.h"
-#include "content/public/browser/resource_controller.h"
#include "content/public/browser/resource_dispatcher_host.h"
#include "content/public/browser/resource_throttle.h"
#include "content/public/browser/web_contents.h"
@@ -94,7 +93,7 @@ class TestNavigationListener
WeakThrottleList::const_iterator it;
for (it = throttles_.begin(); it != throttles_.end(); ++it) {
if (it->get())
- (*it)->Resume();
+ (*it)->ResumeHandler();
}
throttles_.clear();
}
@@ -110,7 +109,7 @@ class TestNavigationListener
WeakThrottleList::iterator it;
for (it = throttles_.begin(); it != throttles_.end(); ++it) {
if (it->get() && it->get()->url() == url) {
- (*it)->Resume();
+ (*it)->ResumeHandler();
throttles_.erase(it);
break;
}
@@ -141,9 +140,7 @@ class TestNavigationListener
class Throttle : public content::ResourceThrottle,
public base::SupportsWeakPtr<Throttle> {
public:
- void Resume() {
- controller()->Resume();
- }
+ void ResumeHandler() { Resume(); }
// content::ResourceThrottle implementation.
void WillStartRequest(bool* defer) override { *defer = true; }

Powered by Google App Engine
This is Rietveld 408576698