| Index: net/websockets/websocket_end_to_end_test.cc
|
| diff --git a/net/websockets/websocket_end_to_end_test.cc b/net/websockets/websocket_end_to_end_test.cc
|
| index db6b4bb4ad42736b1d14326aafb6465bfc5869b9..4116b1b975cb9247c5bdfc1a968a5c4376b00d34 100644
|
| --- a/net/websockets/websocket_end_to_end_test.cc
|
| +++ b/net/websockets/websocket_end_to_end_test.cc
|
| @@ -19,9 +19,11 @@
|
| #include "base/location.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ptr_util.h"
|
| +#include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/strings/string_piece.h"
|
| +#include "base/test/scoped_task_scheduler.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| #include "net/base/auth.h"
|
| #include "net/base/proxy_delegate.h"
|
| @@ -257,7 +259,8 @@ class TestProxyDelegateWithProxyInfo : public ProxyDelegate {
|
| class WebSocketEndToEndTest : public ::testing::Test {
|
| protected:
|
| WebSocketEndToEndTest()
|
| - : event_interface_(),
|
| + : scoped_task_scheduler_(base::MessageLoop::current()),
|
| + event_interface_(),
|
| proxy_delegate_(new TestProxyDelegateWithProxyInfo),
|
| context_(true),
|
| channel_(),
|
| @@ -289,6 +292,7 @@ class WebSocketEndToEndTest : public ::testing::Test {
|
| return !event_interface_->failed();
|
| }
|
|
|
| + base::test::ScopedTaskScheduler scoped_task_scheduler_;
|
| ConnectTestingEventInterface* event_interface_; // owned by channel_
|
| std::unique_ptr<TestProxyDelegateWithProxyInfo> proxy_delegate_;
|
| TestURLRequestContext context_;
|
|
|