Indexed DB: Use BindOnce / OnceCallback / OnceClosure where applicable

content/browser/indexed_db/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 <stddef.h>
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 114 matching lines @@
   void SetQuota(int per_host_quota_kilobytes) {
     SetTempQuota(per_host_quota_kilobytes,
                  BrowserContext::GetDefaultStoragePartition(
                      shell()->web_contents()->GetBrowserContext())
                      ->GetQuotaManager());
   }
 
   static void SetTempQuota(int per_host_quota_kilobytes,
                            scoped_refptr<QuotaManager> qm) {
     if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-      BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-                              base::Bind(&IndexedDBBrowserTest::SetTempQuota,
-                                         per_host_quota_kilobytes, qm));
+      BrowserThread::PostTask(
+          BrowserThread::IO, FROM_HERE,
+          base::BindOnce(&IndexedDBBrowserTest::SetTempQuota,
+                         per_host_quota_kilobytes, qm));
       return;
     }
     DCHECK_CURRENTLY_ON(BrowserThread::IO);
     const int KB = 1024;
     qm->SetQuotaSettings(
         storage::GetHardCodedSettings(per_host_quota_kilobytes * KB));
   }
 
   virtual int64_t RequestDiskUsage() {
     PostTaskAndReplyWithResult(
-        GetContext()->TaskRunner(),
-        FROM_HERE,
-        base::Bind(&IndexedDBContext::GetOriginDiskUsage,
-                   GetContext(),
-                   GURL("file:///")),
-        base::Bind(&IndexedDBBrowserTest::DidGetDiskUsage,
-                   base::Unretained(this)));
+        GetContext()->TaskRunner(), FROM_HERE,
+        base::BindOnce(&IndexedDBContext::GetOriginDiskUsage, GetContext(),
+                       GURL("file:///")),
+        base::BindOnce(&IndexedDBBrowserTest::DidGetDiskUsage,
+                       base::Unretained(this)));
     scoped_refptr<base::ThreadTestHelper> helper(
         new base::ThreadTestHelper(GetContext()->TaskRunner()));
     EXPECT_TRUE(helper->Run());
     // Wait for DidGetDiskUsage to be called.
     base::RunLoop().RunUntilIdle();
     return disk_usage_;
   }
 
   virtual int RequestBlobFileCount() {
     PostTaskAndReplyWithResult(
         GetContext()->TaskRunner(), FROM_HERE,
-        base::Bind(&IndexedDBContextImpl::GetOriginBlobFileCount, GetContext(),
-                   Origin(GURL("file:///"))),
-        base::Bind(&IndexedDBBrowserTest::DidGetBlobFileCount,
-                   base::Unretained(this)));
+        base::BindOnce(&IndexedDBContextImpl::GetOriginBlobFileCount,
+                       GetContext(), Origin(GURL("file:///"))),
+        base::BindOnce(&IndexedDBBrowserTest::DidGetBlobFileCount,
+                       base::Unretained(this)));
     scoped_refptr<base::ThreadTestHelper> helper(
         new base::ThreadTestHelper(GetContext()->TaskRunner()));
     EXPECT_TRUE(helper->Run());
     // Wait for DidGetBlobFileCount to be called.
     base::RunLoop().RunUntilIdle();
     return blob_file_count_;
   }
 
  private:
   static MockBrowserTestIndexedDBClassFactory* GetTestClassFactory() {
@@ skipping 143 matching lines @@
                                   context->data_path(),
                                   kRecursive));
 }
 
 class IndexedDBBrowserTestWithPreexistingLevelDB : public IndexedDBBrowserTest {
  public:
   IndexedDBBrowserTestWithPreexistingLevelDB() {}
   void SetUpOnMainThread() override {
     scoped_refptr<IndexedDBContextImpl> context = GetContext();
     context->TaskRunner()->PostTask(
-        FROM_HERE,
-        base::Bind(
-            &CopyLevelDBToProfile, shell(), context, EnclosingLevelDBDir()));
+        FROM_HERE, base::BindOnce(&CopyLevelDBToProfile, shell(), context,
+                                  EnclosingLevelDBDir()));
     scoped_refptr<base::ThreadTestHelper> helper(
         new base::ThreadTestHelper(GetContext()->TaskRunner()));
     ASSERT_TRUE(helper->Run());
   }
 
   virtual std::string EnclosingLevelDBDir() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IndexedDBBrowserTestWithPreexistingLevelDB);
 };
@@ skipping 89 matching lines @@
   EXPECT_GT(size, kQuotaKilobytes * 1024);
   SetQuota(kQuotaKilobytes);
   SimpleTest(GetTestUrl("indexeddb", "delete_over_quota.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, EmptyBlob) {
   // First delete all IDB's for the test origin
   // TODO(jsbell): Remove static_cast<> when overloads are eliminated.
   GetContext()->TaskRunner()->PostTask(
       FROM_HERE,
-      base::Bind(static_cast<void (IndexedDBContextImpl::*)(const GURL&)>(
-                     &IndexedDBContextImpl::DeleteForOrigin),
-                 GetContext(), GURL("file:///")));
+      base::BindOnce(static_cast<void (IndexedDBContextImpl::*)(const GURL&)>(
+                         &IndexedDBContextImpl::DeleteForOrigin),
+                     GetContext(), GURL("file:///")));
   EXPECT_EQ(0, RequestBlobFileCount());  // Start with no blob files.
   const GURL test_url = GetTestUrl("indexeddb", "empty_blob.html");
   // For some reason Android's futimes fails (EPERM) in this test. Do not assert
   // file times on Android, but do so on other platforms. crbug.com/467247
   // TODO(cmumford): Figure out why this is the case and fix if possible.
 #if defined(OS_ANDROID)
   SimpleTest(GURL(test_url.spec() + "#ignoreTimes"));
 #else
   SimpleTest(GURL(test_url.spec()));
 #endif
@@ skipping 31 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DeleteForOriginDeletesBlobs) {
   SimpleTest(GetTestUrl("indexeddb", "write_4mb_blob.html"));
   int64_t size = RequestDiskUsage();
   // This assertion assumes that we do not compress blobs.
   EXPECT_GT(size, 4 << 20 /* 4 MB */);
   // TODO(jsbell): Remove static_cast<> when overloads are eliminated.
   GetContext()->TaskRunner()->PostTask(
       FROM_HERE,
-      base::Bind(static_cast<void (IndexedDBContextImpl::*)(const GURL&)>(
-                     &IndexedDBContextImpl::DeleteForOrigin),
-                 GetContext(), GURL("file:///")));
+      base::BindOnce(static_cast<void (IndexedDBContextImpl::*)(const GURL&)>(
+                         &IndexedDBContextImpl::DeleteForOrigin),
+                     GetContext(), GURL("file:///")));
   scoped_refptr<base::ThreadTestHelper> helper(
       new base::ThreadTestHelper(GetContext()->TaskRunner()));
   ASSERT_TRUE(helper->Run());
   EXPECT_EQ(0, RequestDiskUsage());
 }
 
 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DiskFullOnCommit) {
   // Ignore several preceding transactions:
   // * The test calls deleteDatabase() which opens the backing store:
   //   #1: IndexedDBBackingStore::OpenBackingStore
@@ skipping 94 matching lines @@
     request_path = request_path.substr(0, query_pos);
   }
 
   if (request_path == "corruptdb" && !request_query.empty()) {
     VLOG(0) << "Requested to corrupt IndexedDB: " << request_query;
     base::WaitableEvent signal_when_finished(
         base::WaitableEvent::ResetPolicy::AUTOMATIC,
         base::WaitableEvent::InitialState::NOT_SIGNALED);
     context->TaskRunner()->PostTask(
         FROM_HERE,
-        base::Bind(&CorruptIndexedDBDatabase, base::ConstRef(context), origin,
-                   &signal_when_finished));
+        base::BindOnce(&CorruptIndexedDBDatabase, base::ConstRef(context),
+                       origin, &signal_when_finished));
     signal_when_finished.Wait();
 
     std::unique_ptr<net::test_server::BasicHttpResponse> http_response(
         new net::test_server::BasicHttpResponse);
     http_response->set_code(net::HTTP_OK);
     return std::move(http_response);
   } else if (request_path == "fail" && !request_query.empty()) {
     FailClass failure_class = FAIL_CLASS_NOTHING;
     FailMethod failure_method = FAIL_METHOD_NOTHING;
     int instance_num = 1;
@@ skipping 201 matching lines @@
 }
 
 // Verify that a "close" event is fired at database connections when
 // the backing store is deleted.
 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ForceCloseEventTest) {
   NavigateAndWaitForTitle(shell(), "force_close_event.html", NULL,
                           "connection ready");
   // TODO(jsbell): Remove static_cast<> when overloads are eliminated.
   GetContext()->TaskRunner()->PostTask(
       FROM_HERE,
-      base::Bind(static_cast<void (IndexedDBContextImpl::*)(const GURL&)>(
-                     &IndexedDBContextImpl::DeleteForOrigin),
-                 GetContext(), GURL("file:///")));
+      base::BindOnce(static_cast<void (IndexedDBContextImpl::*)(const GURL&)>(
+                         &IndexedDBContextImpl::DeleteForOrigin),
+                     GetContext(), GURL("file:///")));
 
   base::string16 expected_title16(ASCIIToUTF16("connection closed"));
   TitleWatcher title_watcher(shell()->web_contents(), expected_title16);
   title_watcher.AlsoWaitForTitle(ASCIIToUTF16("connection closed with error"));
   EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
 }
 
 class IndexedDBBrowserTestSingleProcess : public IndexedDBBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kSingleProcess);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTestSingleProcess,
                        RenderThreadShutdownTest) {
   SimpleTest(GetTestUrl("indexeddb", "shutdown_with_requests.html"));
 }
 
 }  // namespace content