Make IndexedDBConnection IDs independent from the IPC database ID.

content/browser/indexed_db/indexed_db_connection.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_connection.h"
 
 #include "base/logging.h"
 
 namespace content {
 
+namespace {
+
+static int32_t next_id;
+
+}  // namespace
+
 IndexedDBConnection::IndexedDBConnection(
     scoped_refptr<IndexedDBDatabase> database,
     scoped_refptr<IndexedDBDatabaseCallbacks> callbacks)
-    : database_(database), callbacks_(callbacks), weak_factory_(this) {}
+    : id_(next_id++),
+      database_(database),
+      callbacks_(callbacks),
+      weak_factory_(this) {}
 
 IndexedDBConnection::~IndexedDBConnection() {}
 
-void IndexedDBConnection::set_id(int32_t id) {
-  DCHECK_EQ(id_, kInvalidId);
-  id_ = id;
-}
-
 void IndexedDBConnection::Close() {
   if (!callbacks_.get())
     return;
   base::WeakPtr<IndexedDBConnection> this_obj = weak_factory_.GetWeakPtr();
   database_->Close(this, false /* forced */);
   if (this_obj) {
     database_ = nullptr;
     callbacks_ = nullptr;
     active_observers_.clear();
   }
@@ skipping 46 matching lines @@
     if (it != active_observers_.end())
       active_observers_.erase(it);
     else
       pending_observer_ids.push_back(id_to_remove);
   }
   if (!pending_observer_ids.empty())
     database_->RemovePendingObservers(this, pending_observer_ids);
 }
 
 }  // namespace content