summaryrefslogtreecommitdiff
path: root/chromium/ipc/ipc_test_base.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-01-04 14:17:57 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-01-05 10:05:06 +0000
commit39d357e3248f80abea0159765ff39554affb40db (patch)
treeaba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/ipc/ipc_test_base.h
parent87778abf5a1f89266f37d1321b92a21851d8244d (diff)
downloadqtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2 Change-Id: I20d43c737f82764d857ada9a55586901b18b9243 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ipc/ipc_test_base.h')
-rw-r--r--chromium/ipc/ipc_test_base.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/ipc/ipc_test_base.h b/chromium/ipc/ipc_test_base.h
index c85c74f43a1..86dc8fc8055 100644
--- a/chromium/ipc/ipc_test_base.h
+++ b/chromium/ipc/ipc_test_base.h
@@ -111,11 +111,11 @@ class IPCTestBase : public base::MultiProcessTest {
}
const base::Process& client_process() const { return client_process_; }
- scoped_refptr<base::SequencedTaskRunner> task_runner();
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner();
virtual std::unique_ptr<IPC::ChannelFactory> CreateChannelFactory(
const IPC::ChannelHandle& handle,
- base::SequencedTaskRunner* runner);
+ base::SingleThreadTaskRunner* runner);
virtual bool DidStartClient();