IndexedDB: WrapUnique(new T(args..)) -> MakeUnique<T>(args...)

content/browser/indexed_db/indexed_db_unittest.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 <stdint.h>
 #include <utility>
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
@@ skipping 118 matching lines @@
 
   // No data was cleared because of SetForceKeepSessionState.
   EXPECT_TRUE(base::DirectoryExists(normal_path));
   EXPECT_TRUE(base::DirectoryExists(session_only_path));
 }
 
 class ForceCloseDBCallbacks : public IndexedDBCallbacks {
  public:
   ForceCloseDBCallbacks(scoped_refptr<IndexedDBContextImpl> idb_context,
                         const Origin& origin)
-      : IndexedDBCallbacks(NULL, 0, 0),
+      : IndexedDBCallbacks(nullptr, 0, 0),
         idb_context_(idb_context),
         origin_(origin) {}
 
   void OnSuccess() override {}
   void OnSuccess(const std::vector<base::string16>&) override {}
   void OnSuccess(std::unique_ptr<IndexedDBConnection> connection,
                  const IndexedDBDatabaseMetadata& metadata) override {
     connection_ = std::move(connection);
     idb_context_->ConnectionOpened(origin_, connection_.get());
   }
@@ skipping 37 matching lines @@
         new ForceCloseDBCallbacks(idb_context, kTestOrigin);
 
     scoped_refptr<ForceCloseDBCallbacks> closed_callbacks =
         new ForceCloseDBCallbacks(idb_context, kTestOrigin);
 
     IndexedDBFactory* factory = idb_context->GetIDBFactory();
 
     test_path = idb_context->GetFilePathForTesting(kTestOrigin);
 
     std::unique_ptr<IndexedDBPendingConnection> open_connection(
-        new IndexedDBPendingConnection(
+        base::MakeUnique<IndexedDBPendingConnection>(
             open_callbacks, open_db_callbacks, 0 /* child_process_id */,
             0 /* host_transaction_id */, 0 /* version */));
     factory->Open(base::ASCIIToUTF16("opendb"), std::move(open_connection),
-                  NULL /* request_context */, Origin(kTestOrigin),
+                  nullptr /* request_context */, Origin(kTestOrigin),
                   idb_context->data_path());
     std::unique_ptr<IndexedDBPendingConnection> closed_connection(
-        new IndexedDBPendingConnection(
+        base::MakeUnique<IndexedDBPendingConnection>(
             closed_callbacks, closed_db_callbacks, 0 /* child_process_id */,
             0 /* host_transaction_id */, 0 /* version */));
     factory->Open(base::ASCIIToUTF16("closeddb"), std::move(closed_connection),
-                  NULL /* request_context */, Origin(kTestOrigin),
+                  nullptr /* request_context */, Origin(kTestOrigin),
                   idb_context->data_path());
 
     closed_callbacks->connection()->Close();
 
     // TODO(jsbell): Remove static_cast<> when overloads are eliminated.
     idb_context->TaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(static_cast<void (IndexedDBContextImpl::*)(const Origin&)>(
                        &IndexedDBContextImpl::DeleteForOrigin),
                    idb_context, kTestOrigin));
@@ skipping 47 matching lines @@
                                quota_manager_proxy_.get(), task_runner_.get());
 
   scoped_refptr<IndexedDBFactoryImpl> factory =
       static_cast<IndexedDBFactoryImpl*>(context->GetIDBFactory());
 
   scoped_refptr<MockIndexedDBCallbacks> callbacks(new MockIndexedDBCallbacks());
   scoped_refptr<MockIndexedDBDatabaseCallbacks> db_callbacks(
       new MockIndexedDBDatabaseCallbacks());
   const int64_t transaction_id = 1;
   std::unique_ptr<IndexedDBPendingConnection> connection(
-      new IndexedDBPendingConnection(
+      base::MakeUnique<IndexedDBPendingConnection>(
           callbacks, db_callbacks, 0 /* child_process_id */, transaction_id,
           IndexedDBDatabaseMetadata::DEFAULT_VERSION));
   factory->Open(base::ASCIIToUTF16("db"), std::move(connection),
-                NULL /* request_context */, Origin(kTestOrigin),
+                nullptr /* request_context */, Origin(kTestOrigin),
                 temp_dir.path());
 
   EXPECT_TRUE(callbacks->connection());
 
   // ConnectionOpened() is usually called by the dispatcher.
   context->ConnectionOpened(kTestOrigin, callbacks->connection());
 
   EXPECT_TRUE(factory->IsBackingStoreOpen(kTestOrigin));
 
   // Simulate the write failure.
   leveldb::Status status = leveldb::Status::IOError("Simulated failure");
   callbacks->connection()->database()->TransactionCommitFailed(status);
 
   EXPECT_TRUE(db_callbacks->forced_close_called());
   EXPECT_FALSE(factory->IsBackingStoreOpen(kTestOrigin));
 }
 
 }  // namespace content