Move IndexedDB from WEBKIT_DEPRECATED to dedicated thread

content/browser/in_process_webkit/indexed_db_browsertest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/thread_test_helper.h"
+#include "content/browser/browser_main_loop.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 40 matching lines @@
     GURL url = GetTestUrl("indexeddb", filename);
     if (hash)
       url = GURL(url.spec() + hash);
 
     string16 expected_title16(ASCIIToUTF16(expected_string));
     TitleWatcher title_watcher(shell->web_contents(), expected_title16);
     NavigateToURL(shell, url);
     EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
   }
 
-  scoped_refptr<IndexedDBContext> GetContext() {
+  IndexedDBContextImpl* GetContext() {
     StoragePartition* partition =
         BrowserContext::GetDefaultStoragePartition(
             shell()->web_contents()->GetBrowserContext());
-    return partition->GetIndexedDBContext();
+    return static_cast<IndexedDBContextImpl*>(partition->GetIndexedDBContext());
   };
 
   void SetQuota(int quotaKilobytes) {
     const int kTemporaryStorageQuotaSize = quotaKilobytes
         * 1024 * QuotaManager::kPerHostTemporaryPortion;
     SetTempQuota(kTemporaryStorageQuotaSize,
         BrowserContext::GetDefaultStoragePartition(
             shell()->web_contents()->GetBrowserContext())->GetQuotaManager());
   }
 
   static void SetTempQuota(int64 bytes, scoped_refptr<QuotaManager> qm) {
     if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(&IndexedDBBrowserTest::SetTempQuota, bytes, qm));
       return;
     }
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     qm->SetTemporaryGlobalOverrideQuota(bytes, quota::QuotaCallback());
     // Don't return until the quota has been set.
     scoped_refptr<base::ThreadTestHelper> helper(new base::ThreadTestHelper(
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB).get()));
     ASSERT_TRUE(helper->Run());
   }
 
   virtual int64 RequestDiskUsage() {
-    BrowserThread::PostTaskAndReplyWithResult(
-        BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
-        base::Bind(&IndexedDBContext::GetOriginDiskUsage, GetContext(),
-            GURL("file:///")), base::Bind(
-                &IndexedDBBrowserTest::DidGetDiskUsage, this));
-    scoped_refptr<base::ThreadTestHelper> helper(
-        new base::ThreadTestHelper(BrowserThread::GetMessageLoopProxyForThread(
-            BrowserThread::WEBKIT_DEPRECATED).get()));
+    PostTaskAndReplyWithResult(
+        GetContext()->TaskRunner(),
+        FROM_HERE,
+        base::Bind(&IndexedDBContext::GetOriginDiskUsage,
+                   GetContext(),
+                   GURL("file:///")),
+        base::Bind(&IndexedDBBrowserTest::DidGetDiskUsage, this));
+    scoped_refptr<base::ThreadTestHelper> helper(new base::ThreadTestHelper(
+        BrowserMainLoop::GetInstance()->indexed_db_thread()
+            ->message_loop_proxy()));
     EXPECT_TRUE(helper->Run());
     // Wait for DidGetDiskUsage to be called.
     base::MessageLoop::current()->RunUntilIdle();
     return disk_usage_;
   }
  private:
   virtual void DidGetDiskUsage(int64 bytes) {
     EXPECT_GT(bytes, 0);
     disk_usage_ = bytes;
   }
@@ skipping 98 matching lines @@
 };
 
 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestWithGCExposed,
                        DatabaseCallbacksTest) {
   SimpleTest(GetTestUrl("indexeddb", "database_callbacks_first.html"));
 }
 
 static void CopyLevelDBToProfile(Shell* shell,
                                  scoped_refptr<IndexedDBContext> context,
                                  const std::string& test_directory) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
+  DCHECK(context->TaskRunner()->RunsTasksOnCurrentThread());
   base::FilePath leveldb_dir(FILE_PATH_LITERAL("file__0.indexeddb.leveldb"));
   base::FilePath test_data_dir =
       GetTestFilePath("indexeddb", test_directory.c_str()).Append(leveldb_dir);
   IndexedDBContextImpl* context_impl =
       static_cast<IndexedDBContextImpl*>(context.get());
   base::FilePath dest = context_impl->data_path().Append(leveldb_dir);
   // If we don't create the destination directory first, the contents of the
   // leveldb directory are copied directly into profile/IndexedDB instead of
   // profile/IndexedDB/file__0.xxx/
   ASSERT_TRUE(file_util::CreateDirectory(dest));
   const bool kRecursive = true;
   ASSERT_TRUE(file_util::CopyDirectory(test_data_dir,
                                        context_impl->data_path(),
                                        kRecursive));
 }
 
 class IndexedDBBrowserTestWithPreexistingLevelDB : public IndexedDBBrowserTest {
  public:
   virtual void SetUpOnMainThread() OVERRIDE {
-    scoped_refptr<IndexedDBContext> context = GetContext();
-    BrowserThread::PostTask(
-        BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
-        base::Bind(&CopyLevelDBToProfile, shell(), context,
-                   EnclosingLevelDBDir()));
-    scoped_refptr<base::ThreadTestHelper> helper(
-        new base::ThreadTestHelper(BrowserThread::GetMessageLoopProxyForThread(
-            BrowserThread::WEBKIT_DEPRECATED).get()));
+    scoped_refptr<IndexedDBContextImpl> context = GetContext();
+    context->TaskRunner()->PostTask(
+        FROM_HERE,
+        base::Bind(
+            &CopyLevelDBToProfile, shell(), context, EnclosingLevelDBDir()));
+    scoped_refptr<base::ThreadTestHelper> helper(new base::ThreadTestHelper(
+        BrowserMainLoop::GetInstance()->indexed_db_thread()
+            ->message_loop_proxy()));
     ASSERT_TRUE(helper->Run());
   }
 
   virtual std::string EnclosingLevelDBDir() = 0;
 
 };
 
 class IndexedDBBrowserTestWithVersion0Schema : public
     IndexedDBBrowserTestWithPreexistingLevelDB {
   virtual std::string EnclosingLevelDBDir() OVERRIDE {
@@ skipping 144 matching lines @@
   TitleWatcher title_watcher(new_shell->web_contents(), expected_title16);
 
   base::KillProcess(
       shell()->web_contents()->GetRenderProcessHost()->GetHandle(), 0, true);
   shell()->Close();
 
   EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
 }
 
 }  // namespace content