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

content/browser/indexed_db/indexed_db_database.cc

Index: content/browser/indexed_db/indexed_db_database.cc
diff --git a/content/browser/indexed_db/indexed_db_database.cc b/content/browser/indexed_db/indexed_db_database.cc
index 85b6f9d6911e032eca78054e44ad448925585203..beb51ebfc2309d3f054a25fde1c7b3640a25513c 100644
--- a/content/browser/indexed_db/indexed_db_database.cc
+++ b/content/browser/indexed_db/indexed_db_database.cc
@@ -356,20 +356,18 @@ class IndexedDBDatabase::DeleteRequest
   DISALLOW_COPY_AND_ASSIGN(DeleteRequest);
 };
 
-scoped_refptr<IndexedDBDatabase> IndexedDBDatabase::Create(
-    const base::string16& name,
-    IndexedDBBackingStore* backing_store,
-    IndexedDBFactory* factory,
-    const Identifier& unique_identifier,
-    leveldb::Status* s) {
+std::tuple<scoped_refptr<IndexedDBDatabase>, leveldb::Status>
+IndexedDBDatabase::Create(const base::string16& name,
+                          IndexedDBBackingStore* backing_store,

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

While you're here, change these to take scoped_refptr<>

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

Sure, I'll do that in another CL.

+                          IndexedDBFactory* factory,
+                          const Identifier& unique_identifier) {
   scoped_refptr<IndexedDBDatabase> database =
       IndexedDBClassFactory::Get()->CreateIndexedDBDatabase(
           name, backing_store, factory, unique_identifier);
-  *s = database->OpenInternal();
-  if (s->ok())
-    return database;
-  else
-    return NULL;
+  leveldb::Status s = database->OpenInternal();
+  if (!s.ok())
+    database = nullptr;
+  return std::tie(database, s);
 }
 
 IndexedDBDatabase::IndexedDBDatabase(const base::string16& name,