| Index: content/browser/appcache/appcache_url_request_job_unittest.cc
|
| diff --git a/content/browser/appcache/appcache_url_request_job_unittest.cc b/content/browser/appcache/appcache_url_request_job_unittest.cc
|
| index 1a75b97814cf2bfeb3161860a82e3978d62884ae..ed8b6e91831bbebdbcf9ddc28e11cf42a6649222 100644
|
| --- a/content/browser/appcache/appcache_url_request_job_unittest.cc
|
| +++ b/content/browser/appcache/appcache_url_request_job_unittest.cc
|
| @@ -19,10 +19,10 @@
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "base/message_loop/message_loop.h"
|
| #include "base/pickle.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/synchronization/waitable_event.h"
|
| +#include "base/test/scoped_task_environment.h"
|
| #include "base/threading/thread.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| #include "content/browser/appcache/appcache_response.h"
|
| @@ -230,13 +230,15 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
| }
|
|
|
| static void SetUpTestCase() {
|
| + scoped_task_environment_.reset(new base::test::ScopedTaskEnvironment());
|
| io_thread_.reset(new base::Thread("AppCacheURLRequestJobTest Thread"));
|
| base::Thread::Options options(base::MessageLoop::TYPE_IO, 0);
|
| io_thread_->StartWithOptions(options);
|
| }
|
|
|
| static void TearDownTestCase() {
|
| - io_thread_.reset(NULL);
|
| + io_thread_.reset();
|
| + scoped_task_environment_.reset();
|
| }
|
|
|
| AppCacheURLRequestJobTest() {}
|
| @@ -864,10 +866,14 @@ class AppCacheURLRequestJobTest : public testing::Test {
|
| std::unique_ptr<MockURLRequestDelegate> url_request_delegate_;
|
|
|
| static std::unique_ptr<base::Thread> io_thread_;
|
| + static std::unique_ptr<base::test::ScopedTaskEnvironment>
|
| + scoped_task_environment_;
|
| };
|
|
|
| // static
|
| std::unique_ptr<base::Thread> AppCacheURLRequestJobTest::io_thread_;
|
| +std::unique_ptr<base::test::ScopedTaskEnvironment>
|
| + AppCacheURLRequestJobTest::scoped_task_environment_;
|
|
|
| TEST_F(AppCacheURLRequestJobTest, Basic) {
|
| RunTestOnIOThread(&AppCacheURLRequestJobTest::Basic);
|
|
|