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

Unified Diff: content/browser/loader/cross_site_resource_handler_browsertest.cc

Issue 2535723005: Stop using ResourceController in ResourceThrottle (Closed)
Patch Set: Addressed #48 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: content/browser/loader/cross_site_resource_handler_browsertest.cc
diff --git a/content/browser/loader/cross_site_resource_handler_browsertest.cc b/content/browser/loader/cross_site_resource_handler_browsertest.cc
index cfa809fb83a1026caf2f61f84ef7ed2318174f5d..ee916d2528b0b9158978726eb7dccee3fa355cfc 100644
--- a/content/browser/loader/cross_site_resource_handler_browsertest.cc
+++ b/content/browser/loader/cross_site_resource_handler_browsertest.cc
@@ -12,7 +12,6 @@
#include "content/browser/loader/resource_dispatcher_host_impl.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/common/frame_messages.h"
-#include "content/public/browser/resource_controller.h"
#include "content/public/browser/resource_dispatcher_host.h"
#include "content/public/browser/resource_dispatcher_host_delegate.h"
#include "content/public/browser/resource_throttle.h"
@@ -108,7 +107,7 @@ class TestResourceDispatcherHostDelegate
*defer = true;
base::Closure resume_request_on_io_thread = base::Bind(
base::IgnoreResult(&BrowserThread::PostTask), BrowserThread::IO,
- FROM_HERE, base::Bind(&CallbackRunningResourceThrottle::Resume,
+ FROM_HERE, base::Bind(&CallbackRunningResourceThrottle::MarkAndResume,
weak_factory_.GetWeakPtr()));
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
@@ -132,9 +131,9 @@ class TestResourceDispatcherHostDelegate
}
private:
- void Resume() {
+ void MarkAndResume() {
resumed_ = true;
- controller()->Resume();
+ Resume();
}
bool resumed_;

Powered by Google App Engine
This is Rietveld 408576698