Index: net/test/embedded_test_server/embedded_test_server_unittest.cc |
diff --git a/net/test/embedded_test_server/embedded_test_server_unittest.cc b/net/test/embedded_test_server/embedded_test_server_unittest.cc |
index dae43e9709c0e5964cc7097533ae2bf8c5b6e40a..c9721ebc1027cce33120a3169b8034231f3c2aa3 100644 |
--- a/net/test/embedded_test_server/embedded_test_server_unittest.cc |
+++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc |
@@ -9,11 +9,13 @@ |
#include "base/macros.h" |
#include "base/memory/ptr_util.h" |
#include "base/memory/weak_ptr.h" |
+#include "base/message_loop/message_loop.h" |
#include "base/path_service.h" |
#include "base/run_loop.h" |
#include "base/single_thread_task_runner.h" |
#include "base/strings/stringprintf.h" |
#include "base/synchronization/lock.h" |
+#include "base/test/scoped_task_scheduler.h" |
#include "base/threading/thread.h" |
#include "base/threading/thread_task_runner_handle.h" |
#include "crypto/nss_util.h" |
@@ -123,10 +125,10 @@ class EmbeddedTestServerTest |
public URLFetcherDelegate { |
public: |
EmbeddedTestServerTest() |
- : num_responses_received_(0), |
+ : scoped_task_scheduler_(base::MessageLoop::current()), |
+ num_responses_received_(0), |
num_responses_expected_(0), |
- io_thread_("io_thread") { |
- } |
+ io_thread_("io_thread") {} |
void SetUp() override { |
#if defined(USE_NSS_CERTS) |
@@ -193,6 +195,9 @@ class EmbeddedTestServerTest |
return nullptr; |
} |
+ private: |
+ base::test::ScopedTaskScheduler scoped_task_scheduler_; |
+ |
protected: |
int num_responses_received_; |
int num_responses_expected_; |
@@ -505,6 +510,10 @@ typedef std::tr1::tuple<bool, bool, EmbeddedTestServer::Type> |
class EmbeddedTestServerThreadingTest |
: public testing::TestWithParam<ThreadingTestParams> { |
+ protected: |
+ EmbeddedTestServerThreadingTest() |
+ : scoped_task_scheduler_(base::MessageLoop::current()) {} |
+ |
void SetUp() override { |
#if defined(USE_NSS_CERTS) |
// This is needed so NSS's HTTP client functions are initialized on the |
@@ -521,6 +530,9 @@ class EmbeddedTestServerThreadingTest |
ShutdownNSSHttpIO(); |
#endif |
} |
+ |
+ private: |
+ base::test::ScopedTaskScheduler scoped_task_scheduler_; |
}; |
class EmbeddedTestServerThreadingTestDelegate |