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

content/browser/indexed_db/indexed_db_database_unittest.cc

Index: content/browser/indexed_db/indexed_db_database_unittest.cc
diff --git a/content/browser/indexed_db/indexed_db_database_unittest.cc b/content/browser/indexed_db/indexed_db_database_unittest.cc
index a13a163190341782f63d4992899764c3c66cc07b..ad058a0638c0165e227bdc54546482a266d734b9 100644
--- a/content/browser/indexed_db/indexed_db_database_unittest.cc
+++ b/content/browser/indexed_db/indexed_db_database_unittest.cc
@@ -49,13 +49,11 @@ TEST_F(IndexedDBDatabaseTest, BackingStoreRetention) {
   EXPECT_TRUE(backing_store->HasOneRef());
 
   scoped_refptr<MockIndexedDBFactory> factory = new MockIndexedDBFactory();
+  scoped_refptr<IndexedDBDatabase> db;
   leveldb::Status s;
-  scoped_refptr<IndexedDBDatabase> 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());
   EXPECT_FALSE(backing_store->HasOneRef());  // local and db
   db = NULL;
@@ -68,13 +66,11 @@ TEST_F(IndexedDBDatabaseTest, ConnectionLifecycle) {
   EXPECT_TRUE(backing_store->HasOneRef());  // local
 
   scoped_refptr<MockIndexedDBFactory> factory = new MockIndexedDBFactory();
+  scoped_refptr<IndexedDBDatabase> db;
   leveldb::Status s;
-  scoped_refptr<IndexedDBDatabase> 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());
   EXPECT_FALSE(backing_store->HasOneRef());  // local and db
 
@@ -122,13 +118,11 @@ TEST_F(IndexedDBDatabaseTest, ForcedClose) {
   EXPECT_TRUE(backing_store->HasOneRef());
 
   scoped_refptr<MockIndexedDBFactory> factory = new MockIndexedDBFactory();
+  scoped_refptr<IndexedDBDatabase> database;
   leveldb::Status s;
-  scoped_refptr<IndexedDBDatabase> database =
-      IndexedDBDatabase::Create(ASCIIToUTF16("db"),
-                                backing_store.get(),
-                                factory.get(),
-                                IndexedDBDatabase::Identifier(),
-                                &s);
+  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
 
@@ -189,13 +183,11 @@ TEST_F(IndexedDBDatabaseTest, PendingDelete) {
   EXPECT_TRUE(backing_store->HasOneRef());  // local
 
   scoped_refptr<MockIndexedDBFactory> factory = new MockIndexedDBFactory();
+  scoped_refptr<IndexedDBDatabase> db;
   leveldb::Status s;
-  scoped_refptr<IndexedDBDatabase> 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());
   EXPECT_FALSE(backing_store->HasOneRef());  // local and db
 
@@ -245,10 +237,11 @@ TEST_F(IndexedDBDatabaseTest, ConnectionRequestsNoLongerValid) {
 
   const int64_t transaction_id1 = 1;
   scoped_refptr<MockIndexedDBFactory> factory = new MockIndexedDBFactory();
+  scoped_refptr<IndexedDBDatabase> db;
   leveldb::Status s;
-  scoped_refptr<IndexedDBDatabase> 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());
 
   // Make a connection request. This will be processed immediately.
   scoped_refptr<MockIndexedDBCallbacks> request1(new MockIndexedDBCallbacks());
@@ -352,11 +345,9 @@ class IndexedDBDatabaseOperationTest : public testing::Test {
   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();