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

content/browser/indexed_db/indexed_db_database.cc

 // Copyright (c) 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 <math.h>
 
 #include <limits>
 #include <set>
@@ skipping 338 matching lines @@
   void UpgradeTransactionStarted(int64_t old_version) override { NOTREACHED(); }
 
   void UpgradeTransactionFinished(bool committed) override { NOTREACHED(); }
 
  private:
   scoped_refptr<IndexedDBCallbacks> callbacks_;
 
   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,
                                      IndexedDBBackingStore* backing_store,
                                      IndexedDBFactory* factory,
                                      const Identifier& unique_identifier)
     : backing_store_(backing_store),
       metadata_(name,
                 kInvalidId,
                 IndexedDBDatabaseMetadata::NO_VERSION,
@@ skipping 1743 matching lines @@
 
 void IndexedDBDatabase::VersionChangeAbortOperation(
     int64_t previous_version,
     IndexedDBTransaction* transaction) {
   DCHECK(!transaction);
   IDB_TRACE("IndexedDBDatabase::VersionChangeAbortOperation");
   metadata_.version = previous_version;
 }
 
 }  // namespace content