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

Unified Diff: chrome/browser/prerender/prerender_resource_throttle_unittest.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/prerender/prerender_resource_throttle_unittest.cc
diff --git a/chrome/browser/prerender/prerender_resource_throttle_unittest.cc b/chrome/browser/prerender/prerender_resource_throttle_unittest.cc
index 10d2256c817503dbce47e76bfc7487aef8229980..35479f39ce5225e874f3f22c85d2891b2cf07f1e 100644
--- a/chrome/browser/prerender/prerender_resource_throttle_unittest.cc
+++ b/chrome/browser/prerender/prerender_resource_throttle_unittest.cc
@@ -16,8 +16,8 @@
#include "chrome/browser/prerender/prerender_manager.h"
#include "chrome/browser/prerender/prerender_resource_throttle.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "content/public/browser/resource_controller.h"
#include "content/public/browser/resource_request_info.h"
+#include "content/public/browser/resource_throttle.h"
#include "content/public/test/test_browser_thread.h"
#include "ipc/ipc_message.h"
#include "net/base/request_priority.h"
@@ -91,7 +91,7 @@ class TestPrerenderManager : public PrerenderManager {
};
class DeferredRedirectDelegate : public net::URLRequest::Delegate,
- public content::ResourceController {
+ public content::ResourceThrottle::Delegate {
public:
DeferredRedirectDelegate()
: throttle_(NULL),
@@ -102,7 +102,7 @@ class DeferredRedirectDelegate : public net::URLRequest::Delegate,
void SetThrottle(PrerenderResourceThrottle* throttle) {
throttle_ = throttle;
- throttle_->set_controller_for_testing(this);
+ throttle_->set_delegate_for_testing(this);
}
void Run() {
@@ -128,7 +128,7 @@ class DeferredRedirectDelegate : public net::URLRequest::Delegate,
void OnResponseStarted(net::URLRequest* request, int net_error) override {}
void OnReadCompleted(net::URLRequest* request, int bytes_read) override {}
- // content::ResourceController implementation:
+ // content::ResourceThrottle::Delegate implementation:
void Cancel() override {
EXPECT_FALSE(cancel_called_);
EXPECT_FALSE(resume_called_);

Powered by Google App Engine
This is Rietveld 408576698