summaryrefslogtreecommitdiffstats
path: root/content/child/resource_dispatcher_unittest.cc
diff options
context:
space:
mode:
authoralexclarke <alexclarke@chromium.org>2014-12-17 09:29:20 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-17 17:30:17 +0000
commit0bc36e8d3ef1f8e22f910cba216b1ddd2c92d942 (patch)
tree36dee50751849a7a7818bfdafca085ce895e0e41 /content/child/resource_dispatcher_unittest.cc
parent2962ddd760bcd956b1459fc63099980569d257f4 (diff)
downloadchromium_src-0bc36e8d3ef1f8e22f910cba216b1ddd2c92d942.zip
chromium_src-0bc36e8d3ef1f8e22f910cba216b1ddd2c92d942.tar.gz
chromium_src-0bc36e8d3ef1f8e22f910cba216b1ddd2c92d942.tar.bz2
Introduce a ResourceSchedulingFilter and hook it up to the blink scheduler.
Due to ordering expectations baked into the code, we also have to hook ChildResourceMessageFilter and the ResourceDispatcher up to the same task queue. BUG=391005 Review URL: https://codereview.chromium.org/696693002 Cr-Commit-Position: refs/heads/master@{#308817}
Diffstat (limited to 'content/child/resource_dispatcher_unittest.cc')
-rw-r--r--content/child/resource_dispatcher_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/child/resource_dispatcher_unittest.cc b/content/child/resource_dispatcher_unittest.cc
index 16756ec..4324640 100644
--- a/content/child/resource_dispatcher_unittest.cc
+++ b/content/child/resource_dispatcher_unittest.cc
@@ -152,7 +152,7 @@ class TestRequestPeer : public RequestPeer {
// Sets up the message sender override for the unit test.
class ResourceDispatcherTest : public testing::Test, public IPC::Sender {
public:
- ResourceDispatcherTest() : dispatcher_(this) {}
+ ResourceDispatcherTest() : dispatcher_(this, message_loop_.task_runner()) {}
~ResourceDispatcherTest() override {
STLDeleteContainerPairSecondPointers(shared_memory_map_.begin(),
@@ -341,8 +341,8 @@ class ResourceDispatcherTest : public testing::Test, public IPC::Sender {
std::map<int, base::SharedMemory*> shared_memory_map_;
std::vector<IPC::Message> message_queue_;
- ResourceDispatcher dispatcher_;
base::MessageLoop message_loop_;
+ ResourceDispatcher dispatcher_;
};
// Does a simple request and tests that the correct data is received. Simulates