TaskScheduler: migrate appcache database over to use it.

content/browser/appcache/appcache_storage_impl_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/appcache/appcache_storage_impl.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <stack>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.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.h"
 #include "content/browser/appcache/appcache_backend_impl.h"
 #include "content/browser/appcache/appcache_database.h"
 #include "content/browser/appcache/appcache_entry.h"
 #include "content/browser/appcache/appcache_group.h"
 #include "content/browser/appcache/appcache_host.h"
 #include "content/browser/appcache/appcache_interceptor.h"
 #include "content/browser/appcache/appcache_request_handler.h"
@@ skipping 146 matching lines @@
   void CleanUp() override {
     request_context_.reset();
     job_factory_.reset();
   }
 
  private:
   std::unique_ptr<net::URLRequestJobFactory> job_factory_;
   std::unique_ptr<net::URLRequestContext> request_context_;
 };
 
+std::unique_ptr<base::test::ScopedTaskEnvironment> scoped_task_environment;
 std::unique_ptr<IOThread> io_thread;
-std::unique_ptr<base::Thread> db_thread;
+std::unique_ptr<base::Thread> background_thread;
 
 }  // namespace
 
 class AppCacheStorageImplTest : public testing::Test {
  public:
   class MockStorageDelegate : public AppCacheStorage::Delegate {
    public:
     explicit MockStorageDelegate(AppCacheStorageImplTest* test)
         : loaded_cache_id_(0), stored_group_success_(false),
           would_exceed_quota_(false), obsoleted_success_(false),
@@ skipping 69 matching lines @@
     GURL found_manifest_url_;
     AppCacheStorageImplTest* test_;
   };
 
   class MockQuotaManager : public storage::QuotaManager {
    public:
     MockQuotaManager()
         : QuotaManager(true /* is_incognito */,
                        base::FilePath(),
                        io_thread->task_runner().get(),
-                       db_thread->task_runner().get(),
+                       background_thread->task_runner().get(),
                        nullptr,
                        storage::GetQuotaSettingsFunc()),
           async_(false) {}
 
     void GetUsageAndQuota(const GURL& origin,
                           storage::StorageType type,
                           const UsageAndQuotaCallback& callback) override {
       EXPECT_EQ(storage::kStorageTypeTemporary, type);
       if (async_) {
         base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ skipping 73 matching lines @@
     (this->*method)();
   }
 
   // Helper callback to run a test on our io_thread. The io_thread is spun up
   // once and reused for all tests.
   template <class Method>
   void MethodWrapper(Method method) {
     SetUpTest();
 
     // Ensure InitTask execution prior to conducting a test.
-    FlushDbThreadTasks();
+    FlushAllTasks();
 
     // We also have to wait for InitTask completion call to be performed
     // on the IO thread prior to running the test. Its guaranteed to be
     // queued by this time.
     base::ThreadTaskRunnerHandle::Get()->PostTask(

[gab, 2017/06/20 21:29:54]

This could perhaps use SequencedTaskRunnerHandle::Get()?

[michaeln, 2017/07/11 00:33:54]

Done throughout the file

         FROM_HERE, base::Bind(&AppCacheStorageImplTest::RunMethod<Method>,
                               base::Unretained(this), method));
   }
 
   static void SetUpTestCase() {
+    scoped_task_environment.reset(new base::test::ScopedTaskEnvironment());
+
     // We start both threads as TYPE_IO because we also use the db_thead
     // for the disk_cache which needs to be of TYPE_IO.
     base::Thread::Options options(base::MessageLoop::TYPE_IO, 0);
     io_thread.reset(new IOThread("AppCacheTest.IOThread"));
     ASSERT_TRUE(io_thread->StartWithOptions(options));
-    db_thread.reset(new base::Thread("AppCacheTest::DBThread"));
-    ASSERT_TRUE(db_thread->StartWithOptions(options));
+    background_thread.reset(new base::Thread("AppCacheTest::BackgroundThread"));
+    ASSERT_TRUE(background_thread->StartWithOptions(options));
   }
 
   static void TearDownTestCase() {
-    io_thread.reset(NULL);
-    db_thread.reset(NULL);
+    io_thread.reset();
+    background_thread.reset();
+    scoped_task_environment.reset();
   }
 
   // Test harness --------------------------------------------------
 
   AppCacheStorageImplTest() { request_delegate_.set_quit_on_complete(false); }
 
   template <class Method>
   void RunTestOnIOThread(Method method) {
     test_finished_event_.reset(new base::WaitableEvent(
         base::WaitableEvent::ResetPolicy::AUTOMATIC,
         base::WaitableEvent::InitialState::NOT_SIGNALED));
     io_thread->task_runner()->PostTask(
         FROM_HERE, base::Bind(&AppCacheStorageImplTest::MethodWrapper<Method>,
                               base::Unretained(this), method));
     test_finished_event_->Wait();
   }
 
   void SetUpTest() {
     DCHECK(io_thread->task_runner()->BelongsToCurrentThread());
-    service_.reset(new AppCacheServiceImpl(NULL));
-    service_->Initialize(base::FilePath(), db_thread->task_runner(), NULL);
+    service_.reset(new AppCacheServiceImpl(nullptr));
+    service_->Initialize(base::FilePath(), background_thread->task_runner());
     mock_quota_manager_proxy_ = new MockQuotaManagerProxy();
     service_->quota_manager_proxy_ = mock_quota_manager_proxy_;
     delegate_.reset(new MockStorageDelegate(this));
   }
 
   void TearDownTest() {
     DCHECK(io_thread->task_runner()->BelongsToCurrentThread());
+    scoped_refptr<base::SequencedTaskRunner> db_runner =
+        storage()->db_task_runner_;
     storage()->CancelDelegateCallbacks(delegate());
     group_ = NULL;
     cache_ = NULL;
     cache2_ = NULL;
     mock_quota_manager_proxy_ = NULL;
     delegate_.reset();
     service_.reset();
-    FlushDbThreadTasks();
+    FlushTasks(db_runner.get());
+    FlushTasks(background_thread->task_runner().get());
+    FlushTasks(db_runner.get());
   }
 
   void TestFinished() {
     // We unwind the stack prior to finishing up to let stack
     // based objects get deleted.
     DCHECK(io_thread->task_runner()->BelongsToCurrentThread());
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&AppCacheStorageImplTest::TestFinishedUnwound,
                               base::Unretained(this)));
   }
@@ skipping 13 matching lines @@
       return;
     }
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, task_stack_.top());
     task_stack_.pop();
   }
 
   static void SignalEvent(base::WaitableEvent* event) {
     event->Signal();
   }
 
-  void FlushDbThreadTasks() {
+  void FlushAllTasks() {
+    FlushTasks(storage()->db_task_runner_.get());
+    FlushTasks(background_thread->task_runner().get());
+    FlushTasks(storage()->db_task_runner_.get());
+  }
+
+  void FlushTasks(base::SequencedTaskRunner* runner) {
     // We pump a task thru the db thread to ensure any tasks previously
     // scheduled on that thread have been performed prior to return.
     base::WaitableEvent event(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                               base::WaitableEvent::InitialState::NOT_SIGNALED);
-    db_thread->task_runner()->PostTask(
-        FROM_HERE, base::Bind(&AppCacheStorageImplTest::SignalEvent, &event));
+    runner->PostTask(FROM_HERE,
+                     base::Bind(&AppCacheStorageImplTest::SignalEvent, &event));
     event.Wait();
   }
 
   // LoadCache_Miss ----------------------------------------------------
 
   void LoadCache_Miss() {
     // Attempt to load a cache that doesn't exist. Should
     // complete asynchronously.
     PushNextTask(base::Bind(&AppCacheStorageImplTest::Verify_LoadCache_Miss,
                             base::Unretained(this)));
@@ skipping 408 matching lines @@
 
     // Conduct the test.
     storage()->MarkEntryAsForeign(kEntryUrl, 1);
 
     // The entry in the working set should have been updated syncly.
     EXPECT_TRUE(cache_->GetEntry(kEntryUrl)->IsForeign());
     EXPECT_TRUE(cache_->GetEntry(kEntryUrl)->IsExplicit());
 
     // And the entry in storage should also be updated, but that
     // happens asynchronously on the db thread.
-    FlushDbThreadTasks();
+    FlushAllTasks();
     AppCacheDatabase::EntryRecord entry_record2;
     EXPECT_TRUE(database()->FindEntry(1, kEntryUrl, &entry_record2));
     EXPECT_EQ(AppCacheEntry::EXPLICIT | AppCacheEntry::FOREIGN,
               entry_record2.flags);
     TestFinished();
   }
 
   // MarkEntryAsForeignWithLoadInProgress  -------------------------------
 
   void MarkEntryAsForeignWithLoadInProgress() {
@@ skipping 24 matching lines @@
 
   void Verify_MarkEntryAsForeignWithLoadInProgress() {
     EXPECT_EQ(1, delegate()->loaded_cache_id_);
     EXPECT_TRUE(delegate()->loaded_cache_.get());
 
     // The entry in the working set should have been updated upon load.
     EXPECT_TRUE(delegate()->loaded_cache_->GetEntry(kEntryUrl)->IsForeign());
     EXPECT_TRUE(delegate()->loaded_cache_->GetEntry(kEntryUrl)->IsExplicit());
 
     // And the entry in storage should also be updated.
-    FlushDbThreadTasks();
+    FlushAllTasks();
     AppCacheDatabase::EntryRecord entry_record;
     EXPECT_TRUE(database()->FindEntry(1, kEntryUrl, &entry_record));
     EXPECT_EQ(AppCacheEntry::EXPLICIT | AppCacheEntry::FOREIGN,
               entry_record.flags);
     TestFinished();
   }
 
   // FindNoMainResponse  -------------------------------
 
   void FindNoMainResponse() {
@@ skipping 759 matching lines @@
       entry_record.url = manifest_url;
       entry_record.flags = AppCacheEntry::MANIFEST;
       entry_record.response_id = 1;
       entry_record.response_size = kDefaultEntrySize;
       EXPECT_TRUE(db.InsertEntry(&entry_record));
     }
 
     // Recreate the service to point at the db and corruption on disk.
     service_.reset(new AppCacheServiceImpl(NULL));
     service_->set_request_context(io_thread->request_context());
-    service_->Initialize(temp_directory_.GetPath(), db_thread->task_runner(),
-                         db_thread->task_runner());
+    service_->Initialize(temp_directory_.GetPath(),
+                         background_thread->task_runner());
     mock_quota_manager_proxy_ = new MockQuotaManagerProxy();
     service_->quota_manager_proxy_ = mock_quota_manager_proxy_;
     delegate_.reset(new MockStorageDelegate(this));
 
     // Additional setup to observe reinitailize happens.
     observer_.reset(new MockServiceObserver(this));
     service_->AddObserver(observer_.get());
 
     // We continue after the init task is complete including the callback
     // on the current thread.
-    FlushDbThreadTasks();
+    FlushAllTasks();
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&AppCacheStorageImplTest::Continue_Reinitialize,
                               base::Unretained(this), test_case));
   }
 
   void Continue_Reinitialize(ReinitTestCase test_case) {
     const int kMockProcessId = 1;
     backend_.reset(new AppCacheBackendImpl);
     backend_->Initialize(service_.get(), &frontend_, kMockProcessId);
 
@@ skipping 57 matching lines @@
     if (test_case == CORRUPT_CACHE_ON_INSTALL ||
         test_case == CORRUPT_SQL_ON_INSTALL) {
       EXPECT_TRUE(frontend_.error_event_was_raised_);
       AppCacheHost* host1 = backend_->GetHost(1);
       EXPECT_FALSE(host1->associated_cache());
       EXPECT_FALSE(host1->group_being_updated_.get());
       EXPECT_TRUE(host1->disabled_storage_reference_.get());
     } else {
       ASSERT_EQ(CORRUPT_CACHE_ON_LOAD_EXISTING, test_case);
       AppCacheHost* host2 = backend_->GetHost(2);
-      EXPECT_EQ(1, host2->main_resource_cache_->cache_id());
       EXPECT_TRUE(host2->disabled_storage_reference_.get());
     }
 
     // Cleanup and claim victory.
     service_->RemoveObserver(observer_.get());
     request_.reset();
     backend_.reset();
     observer_.reset();
     TestFinished();
   }
@@ skipping 201 matching lines @@
   RunTestOnIOThread(&AppCacheStorageImplTest::Reinitialize2);
 }
 
 TEST_F(AppCacheStorageImplTest, Reinitialize3) {
   RunTestOnIOThread(&AppCacheStorageImplTest::Reinitialize3);
 }
 
 // That's all folks!
 
 }  // namespace content