Move IndexedDB from WEBKIT_DEPRECATED to dedicated thread

content/browser/indexed_db/indexed_db_quota_client_unittest.cc

 // Copyright (c) 2011 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 <map>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
-#include "base/message_loop/message_loop_proxy.h"
+#include "base/test/thread_test_helper.h"
+#include "base/threading/thread.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/indexed_db/indexed_db_quota_client.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/test/test_browser_context.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/browser/quota/mock_quota_manager.h"
 #include "webkit/common/database/database_identifier.h"
 
 // Declared to shorten the line lengths.
 static const quota::StorageType kTemp = quota::kStorageTypeTemporary;
 static const quota::StorageType kPerm = quota::kStorageTypePersistent;
 
 namespace content {
 
 // Base class for our test fixtures.
 class IndexedDBQuotaClientTest : public testing::Test {
  public:
   const GURL kOriginA;
   const GURL kOriginB;
   const GURL kOriginOther;
 
   IndexedDBQuotaClientTest()
       : kOriginA("http://host"),
         kOriginB("http://host:8000"),
         kOriginOther("http://other"),
         usage_(0),
-        weak_factory_(this),
-        message_loop_(base::MessageLoop::TYPE_IO),
-        db_thread_(BrowserThread::DB, &message_loop_),
-        webkit_thread_(BrowserThread::WEBKIT_DEPRECATED, &message_loop_),
-        file_thread_(BrowserThread::FILE, &message_loop_),
-        file_user_blocking_thread_(BrowserThread::FILE_USER_BLOCKING,
-                                   &message_loop_),
-        io_thread_(BrowserThread::IO, &message_loop_) {
+        idb_thread_(new base::Thread("IndexedDBTest")),
+        weak_factory_(this) {
     browser_context_.reset(new TestBrowserContext());
-    idb_context_ = static_cast<IndexedDBContextImpl*>(
-        BrowserContext::GetDefaultStoragePartition(browser_context_.get())
-            ->GetIndexedDBContext());
-    message_loop_.RunUntilIdle();
+
+    scoped_refptr<quota::QuotaManager> quota_manager =
+        new quota::MockQuotaManager(
+            false /*in_memory*/,
+            browser_context_->GetPath(),
+            base::MessageLoop::current()->message_loop_proxy(),
+            base::MessageLoop::current()->message_loop_proxy(),
+            browser_context_->GetSpecialStoragePolicy());
+
+    idb_thread_->Start();
+    idb_context_ =
+        new IndexedDBContextImpl(browser_context_->GetPath(),
+                                 browser_context_->GetSpecialStoragePolicy(),
+                                 quota_manager->proxy(),
+                                 idb_thread_->message_loop());
+    base::MessageLoop::current()->RunUntilIdle();
     setup_temp_dir();
   }
+
+  void FlushIndexedDBTaskRunner() {
+    scoped_refptr<base::ThreadTestHelper> helper(
+        new base::ThreadTestHelper(idb_context_->MessageLoopProxy()));
+    ASSERT_TRUE(helper->Run());
+  }
+
   void setup_temp_dir() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base::FilePath indexeddb_dir =
         temp_dir_.path().Append(IndexedDBContextImpl::kIndexedDBDirectory);
     ASSERT_TRUE(file_util::CreateDirectory(indexeddb_dir));
     idb_context()->set_data_path_for_testing(indexeddb_dir);
   }
 
   virtual ~IndexedDBQuotaClientTest() {
-    // IndexedDBContext needs to be destructed on
-    // BrowserThread::WEBKIT_DEPRECATED, which is also a member variable of this
-    // class.  Cause IndexedDBContext's destruction now to ensure that it
-    // doesn't outlive BrowserThread::WEBKIT_DEPRECATED.
+    FlushIndexedDBTaskRunner();
     idb_context_ = NULL;
     browser_context_.reset();
     base::MessageLoop::current()->RunUntilIdle();
   }
 
   int64 GetOriginUsage(quota::QuotaClient* client,
                        const GURL& origin,
                        quota::StorageType type) {
     usage_ = -1;
     client->GetOriginUsage(
         origin,
         type,
         base::Bind(&IndexedDBQuotaClientTest::OnGetOriginUsageComplete,
                    weak_factory_.GetWeakPtr()));
+    FlushIndexedDBTaskRunner();
     base::MessageLoop::current()->RunUntilIdle();
     EXPECT_GT(usage_, -1);
     return usage_;
   }
 
   const std::set<GURL>& GetOriginsForType(quota::QuotaClient* client,
                                           quota::StorageType type) {
     origins_.clear();
     client->GetOriginsForType(
         type,
         base::Bind(&IndexedDBQuotaClientTest::OnGetOriginsComplete,
                    weak_factory_.GetWeakPtr()));
+    FlushIndexedDBTaskRunner();
     base::MessageLoop::current()->RunUntilIdle();
     return origins_;
   }
 
   const std::set<GURL>& GetOriginsForHost(quota::QuotaClient* client,
                                           quota::StorageType type,
                                           const std::string& host) {
     origins_.clear();
     client->GetOriginsForHost(
         type,
         host,
         base::Bind(&IndexedDBQuotaClientTest::OnGetOriginsComplete,
                    weak_factory_.GetWeakPtr()));
+    FlushIndexedDBTaskRunner();
     base::MessageLoop::current()->RunUntilIdle();
     return origins_;
   }
 
   quota::QuotaStatusCode DeleteOrigin(quota::QuotaClient* client,
                                       const GURL& origin_url) {
     delete_status_ = quota::kQuotaStatusUnknown;
     client->DeleteOriginData(
         origin_url,
         kTemp,
         base::Bind(&IndexedDBQuotaClientTest::OnDeleteOriginComplete,
                    weak_factory_.GetWeakPtr()));
+    FlushIndexedDBTaskRunner();
     base::MessageLoop::current()->RunUntilIdle();
     return delete_status_;
   }
 
   IndexedDBContextImpl* idb_context() { return idb_context_.get(); }
 
   void SetFileSizeTo(const base::FilePath& path, int size) {
     std::string junk(size, 'a');
     ASSERT_EQ(size, file_util::WriteFile(path, junk.c_str(), size));
   }
@@ skipping 17 matching lines @@
     origins_ = origins;
   }
 
   void OnDeleteOriginComplete(quota::QuotaStatusCode code) {
     delete_status_ = code;
   }
 
   base::ScopedTempDir temp_dir_;
   int64 usage_;
   std::set<GURL> origins_;
+  scoped_ptr<base::Thread> idb_thread_;
   scoped_refptr<IndexedDBContextImpl> idb_context_;
   base::WeakPtrFactory<IndexedDBQuotaClientTest> weak_factory_;
-  base::MessageLoop message_loop_;
-  BrowserThreadImpl db_thread_;
-  BrowserThreadImpl webkit_thread_;
-  BrowserThreadImpl file_thread_;
-  BrowserThreadImpl file_user_blocking_thread_;
-  BrowserThreadImpl io_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestBrowserContext> browser_context_;
   quota::QuotaStatusCode delete_status_;
 };
 
 TEST_F(IndexedDBQuotaClientTest, GetOriginUsage) {
-  IndexedDBQuotaClient client(base::MessageLoopProxy::current().get(),
-                              idb_context());
+  IndexedDBQuotaClient client(idb_context());
 
   AddFakeIndexedDB(kOriginA, 6);
   AddFakeIndexedDB(kOriginB, 3);
   EXPECT_EQ(6, GetOriginUsage(&client, kOriginA, kTemp));
   EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kPerm));
   EXPECT_EQ(3, GetOriginUsage(&client, kOriginB, kTemp));
   EXPECT_EQ(0, GetOriginUsage(&client, kOriginB, kPerm));
 
   AddFakeIndexedDB(kOriginA, 1000);
   EXPECT_EQ(1000, GetOriginUsage(&client, kOriginA, kTemp));
   EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kPerm));
   EXPECT_EQ(3, GetOriginUsage(&client, kOriginB, kTemp));
   EXPECT_EQ(0, GetOriginUsage(&client, kOriginB, kPerm));
 }
 
 TEST_F(IndexedDBQuotaClientTest, GetOriginsForHost) {
-  IndexedDBQuotaClient client(base::MessageLoopProxy::current().get(),
-                              idb_context());
+  IndexedDBQuotaClient client(idb_context());
 
   EXPECT_EQ(kOriginA.host(), kOriginB.host());
   EXPECT_NE(kOriginA.host(), kOriginOther.host());
 
   std::set<GURL> origins = GetOriginsForHost(&client, kTemp, kOriginA.host());
   EXPECT_TRUE(origins.empty());
 
   AddFakeIndexedDB(kOriginA, 1000);
   origins = GetOriginsForHost(&client, kTemp, kOriginA.host());
   EXPECT_EQ(origins.size(), 1ul);
   EXPECT_TRUE(origins.find(kOriginA) != origins.end());
 
   AddFakeIndexedDB(kOriginB, 1000);
   origins = GetOriginsForHost(&client, kTemp, kOriginA.host());
   EXPECT_EQ(origins.size(), 2ul);
   EXPECT_TRUE(origins.find(kOriginA) != origins.end());
   EXPECT_TRUE(origins.find(kOriginB) != origins.end());
 
   EXPECT_TRUE(GetOriginsForHost(&client, kPerm, kOriginA.host()).empty());
   EXPECT_TRUE(GetOriginsForHost(&client, kTemp, kOriginOther.host()).empty());
 }
 
 TEST_F(IndexedDBQuotaClientTest, GetOriginsForType) {
-  IndexedDBQuotaClient client(base::MessageLoopProxy::current().get(),
-                              idb_context());
+  IndexedDBQuotaClient client(idb_context());
 
   EXPECT_TRUE(GetOriginsForType(&client, kTemp).empty());
   EXPECT_TRUE(GetOriginsForType(&client, kPerm).empty());
 
   AddFakeIndexedDB(kOriginA, 1000);
   std::set<GURL> origins = GetOriginsForType(&client, kTemp);
   EXPECT_EQ(origins.size(), 1ul);
   EXPECT_TRUE(origins.find(kOriginA) != origins.end());
 
   EXPECT_TRUE(GetOriginsForType(&client, kPerm).empty());
 }
 
 TEST_F(IndexedDBQuotaClientTest, DeleteOrigin) {
-  IndexedDBQuotaClient client(base::MessageLoopProxy::current().get(),
-                              idb_context());
+  IndexedDBQuotaClient client(idb_context());
 
   AddFakeIndexedDB(kOriginA, 1000);
   AddFakeIndexedDB(kOriginB, 50);
   EXPECT_EQ(1000, GetOriginUsage(&client, kOriginA, kTemp));
   EXPECT_EQ(50, GetOriginUsage(&client, kOriginB, kTemp));
 
   quota::QuotaStatusCode delete_status = DeleteOrigin(&client, kOriginA);
   EXPECT_EQ(quota::kQuotaStatusOk, delete_status);
   EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kTemp));
   EXPECT_EQ(50, GetOriginUsage(&client, kOriginB, kTemp));
 }
 
 }  // namespace content