IndexedDB: IndexedDBDatabase::Create() returning db/status tuple.

content/browser/indexed_db/indexed_db_database_unittest.cc

 // Copyright 2013 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/indexed_db/indexed_db_database.h"
 
 #include <stdint.h>
 #include <set>
 #include <utility>
 
@@ skipping 32 matching lines @@
   TestBrowserThreadBundle thread_bundle_;
 };
 
 TEST_F(IndexedDBDatabaseTest, BackingStoreRetention) {
   scoped_refptr<IndexedDBFakeBackingStore> backing_store =
       new IndexedDBFakeBackingStore();
   EXPECT_TRUE(backing_store->HasOneRef());
 
   scoped_refptr<MockIndexedDBFactory> factory = new MockIndexedDBFactory();
   leveldb::Status s;
-  scoped_refptr<IndexedDBDatabase> db =
-      IndexedDBDatabase::Create(ASCIIToUTF16("db"),
-                                backing_store.get(),
-                                factory.get(),
-                                IndexedDBDatabase::Identifier(),
-                                &s);
+  scoped_refptr<IndexedDBDatabase> db;
+  std::tie(db, s) =
+      IndexedDBDatabase::Create(ASCIIToUTF16("db"), backing_store.get(),
+                                factory.get(), IndexedDBDatabase::Identifier());
   ASSERT_TRUE(s.ok());
   EXPECT_FALSE(backing_store->HasOneRef());  // local and db
   db = NULL;
   EXPECT_TRUE(backing_store->HasOneRef());  // local
 }
 
 TEST_F(IndexedDBDatabaseTest, ConnectionLifecycle) {
   scoped_refptr<IndexedDBFakeBackingStore> backing_store =
       new IndexedDBFakeBackingStore();
   EXPECT_TRUE(backing_store->HasOneRef());  // local
 
   scoped_refptr<MockIndexedDBFactory> factory = new MockIndexedDBFactory();
   leveldb::Status s;

[jsbell, 2016/11/21 20:07:20]

nit: I'd flip the order here to match the tuple order.

[cmumford, 2016/11/22 16:43:19]

Done.

-  scoped_refptr<IndexedDBDatabase> db =
-      IndexedDBDatabase::Create(ASCIIToUTF16("db"),
-                                backing_store.get(),
-                                factory.get(),
-                                IndexedDBDatabase::Identifier(),
-                                &s);
+  scoped_refptr<IndexedDBDatabase> db;
+  std::tie(db, s) =
+      IndexedDBDatabase::Create(ASCIIToUTF16("db"), backing_store.get(),
+                                factory.get(), IndexedDBDatabase::Identifier());
   ASSERT_TRUE(s.ok());
   EXPECT_FALSE(backing_store->HasOneRef());  // local and db
 
   scoped_refptr<MockIndexedDBCallbacks> request1(new MockIndexedDBCallbacks());
   scoped_refptr<MockIndexedDBDatabaseCallbacks> callbacks1(
       new MockIndexedDBDatabaseCallbacks());
   const int64_t transaction_id1 = 1;
   std::unique_ptr<IndexedDBPendingConnection> connection1(
       base::MakeUnique<IndexedDBPendingConnection>(
           request1, callbacks1, kFakeChildProcessId, transaction_id1,
@@ skipping 28 matching lines @@
   db = NULL;
 }
 
 TEST_F(IndexedDBDatabaseTest, ForcedClose) {
   scoped_refptr<IndexedDBFakeBackingStore> backing_store =
       new IndexedDBFakeBackingStore();
   EXPECT_TRUE(backing_store->HasOneRef());
 
   scoped_refptr<MockIndexedDBFactory> factory = new MockIndexedDBFactory();
   leveldb::Status s;
-  scoped_refptr<IndexedDBDatabase> database =
-      IndexedDBDatabase::Create(ASCIIToUTF16("db"),
-                                backing_store.get(),
-                                factory.get(),
-                                IndexedDBDatabase::Identifier(),
-                                &s);
+  scoped_refptr<IndexedDBDatabase> database;
+  std::tie(database, s) =
+      IndexedDBDatabase::Create(ASCIIToUTF16("db"), backing_store.get(),
+                                factory.get(), IndexedDBDatabase::Identifier());
   ASSERT_TRUE(s.ok());
   EXPECT_FALSE(backing_store->HasOneRef());  // local and db
 
   scoped_refptr<MockIndexedDBDatabaseCallbacks> callbacks(
       new MockIndexedDBDatabaseCallbacks());
   scoped_refptr<MockIndexedDBCallbacks> request(new MockIndexedDBCallbacks());
   const int64_t upgrade_transaction_id = 3;
   std::unique_ptr<IndexedDBPendingConnection> connection(
       base::MakeUnique<IndexedDBPendingConnection>(
           request, callbacks, kFakeChildProcessId, upgrade_transaction_id,
@@ skipping 41 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MockCallbacks);
 };
 
 TEST_F(IndexedDBDatabaseTest, PendingDelete) {
   scoped_refptr<IndexedDBFakeBackingStore> backing_store =
       new IndexedDBFakeBackingStore();
   EXPECT_TRUE(backing_store->HasOneRef());  // local
 
   scoped_refptr<MockIndexedDBFactory> factory = new MockIndexedDBFactory();
   leveldb::Status s;
-  scoped_refptr<IndexedDBDatabase> db =
-      IndexedDBDatabase::Create(ASCIIToUTF16("db"),
-                                backing_store.get(),
-                                factory.get(),
-                                IndexedDBDatabase::Identifier(),
-                                &s);
+  scoped_refptr<IndexedDBDatabase> db;
+  std::tie(db, s) =
+      IndexedDBDatabase::Create(ASCIIToUTF16("db"), backing_store.get(),
+                                factory.get(), IndexedDBDatabase::Identifier());
   ASSERT_TRUE(s.ok());
   EXPECT_FALSE(backing_store->HasOneRef());  // local and db
 
   scoped_refptr<MockIndexedDBCallbacks> request1(new MockIndexedDBCallbacks());
   scoped_refptr<MockIndexedDBDatabaseCallbacks> callbacks1(
       new MockIndexedDBDatabaseCallbacks());
   const int64_t transaction_id1 = 1;
   std::unique_ptr<IndexedDBPendingConnection> connection(
       base::MakeUnique<IndexedDBPendingConnection>(
           request1, callbacks1, kFakeChildProcessId, transaction_id1,
@@ skipping 30 matching lines @@
   EXPECT_TRUE(request2->success_called());
 }
 
 TEST_F(IndexedDBDatabaseTest, ConnectionRequestsNoLongerValid) {
   scoped_refptr<IndexedDBFakeBackingStore> backing_store =
       new IndexedDBFakeBackingStore();
 
   const int64_t transaction_id1 = 1;
   scoped_refptr<MockIndexedDBFactory> factory = new MockIndexedDBFactory();
   leveldb::Status s;
-  scoped_refptr<IndexedDBDatabase> db = IndexedDBDatabase::Create(
-      ASCIIToUTF16("db"), backing_store.get(), factory.get(),
-      IndexedDBDatabase::Identifier(), &s);
+  scoped_refptr<IndexedDBDatabase> db;
+  std::tie(db, s) =
+      IndexedDBDatabase::Create(ASCIIToUTF16("db"), backing_store.get(),
+                                factory.get(), IndexedDBDatabase::Identifier());
 
   // Make a connection request. This will be processed immediately.
   scoped_refptr<MockIndexedDBCallbacks> request1(new MockIndexedDBCallbacks());
   {
     std::unique_ptr<IndexedDBPendingConnection> connection(
         base::MakeUnique<IndexedDBPendingConnection>(
             request1, make_scoped_refptr(new MockIndexedDBDatabaseCallbacks()),
             kFakeChildProcessId, transaction_id1,
             IndexedDBDatabaseMetadata::DEFAULT_VERSION));
     db->OpenConnection(std::move(connection));
@@ skipping 83 matching lines @@
 
 class IndexedDBDatabaseOperationTest : public testing::Test {
  public:
   IndexedDBDatabaseOperationTest()
       : commit_success_(leveldb::Status::OK()),
         factory_(new MockIndexedDBFactory()) {}
 
   void SetUp() override {
     backing_store_ = new IndexedDBFakeBackingStore();
     leveldb::Status s;
-    db_ = IndexedDBDatabase::Create(ASCIIToUTF16("db"),
-                                    backing_store_.get(),
-                                    factory_.get(),
-                                    IndexedDBDatabase::Identifier(),
-                                    &s);
+    std::tie(db_, s) = IndexedDBDatabase::Create(
+        ASCIIToUTF16("db"), backing_store_.get(), factory_.get(),
+        IndexedDBDatabase::Identifier());
     ASSERT_TRUE(s.ok());
 
     request_ = new MockIndexedDBCallbacks();
     callbacks_ = new MockIndexedDBDatabaseCallbacks();
     const int64_t transaction_id = 1;
     std::unique_ptr<IndexedDBPendingConnection> connection(
         base::MakeUnique<IndexedDBPendingConnection>(
             request_, callbacks_, kFakeChildProcessId, transaction_id,
             IndexedDBDatabaseMetadata::DEFAULT_VERSION));
     db_->OpenConnection(std::move(connection));
@@ skipping 153 matching lines @@
   EXPECT_EQ(1ULL, db_->metadata().object_stores.size());
 
   // This will execute the Put then Delete.
   RunPostedTasks();
   EXPECT_EQ(0ULL, db_->metadata().object_stores.size());
 
   transaction_->Commit();  // Cleans up the object hierarchy.
 }
 
 }  // namespace content