Use leveldb_env::OpenDB() to open leveldb databases.

content/browser/indexed_db/leveldb/leveldb_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/leveldb/leveldb_database.h"
 
 #include <inttypes.h>
 #include <stdint.h>
 
 #include <cerrno>
@@ skipping 122 matching lines @@
   options.compression = leveldb::kSnappyCompression;
   options.write_buffer_size =
       leveldb_env::WriteBufferSize(base::SysInfo::AmountOfTotalDiskSpace(path));
 
   // For info about the troubles we've run into with this parameter, see:
   // https://code.google.com/p/chromium/issues/detail?id=227313#c11
   options.max_open_files = 80;
   options.env = env;
 
   // ChromiumEnv assumes UTF8, converts back to FilePath before using.
-  leveldb::DB* db_ptr = nullptr;
-  leveldb::Status s = leveldb::DB::Open(options, path.AsUTF8Unsafe(), &db_ptr);
-  db->reset(db_ptr);
-
-  return s;
+  return leveldb_env::OpenDB(options, path.AsUTF8Unsafe(), db);
 }
 
 leveldb::Status LevelDBDatabase::Destroy(const base::FilePath& file_name) {
   leveldb::Options options;
   options.env = LevelDBEnv::Get();
   // ChromiumEnv assumes UTF8, converts back to FilePath before using.
   return leveldb::DestroyDB(file_name.AsUTF8Unsafe(), options);
 }
 
 namespace {
@@ skipping 326 matching lines @@
 
   // Dumps in BACKGROUND mode cannot have strings or edges in order to minimize
   // trace size and instrumentation overhead.
   if (args.level_of_detail ==
       base::trace_event::MemoryDumpLevelOfDetail::BACKGROUND) {
     return true;
   }
 
   dump->AddString("file_name", "", file_name_for_tracing);
 
-  // Memory is allocated from system allocator (malloc).
+  // All leveldb databases are already dumped by leveldb_env::DBTracker. Add
+  // an edge to avoid double counting.
   pmd->AddSuballocation(dump->guid(),
-                        base::trace_event::MemoryDumpManager::GetInstance()
-                            ->system_allocator_pool_name());
+                        leveldb_env::DBTracker::GetMemoryDumpName(db_.get()));
+
   return true;
 }
 
 std::unique_ptr<leveldb::Iterator> LevelDBDatabase::CreateLevelDBIterator(
     const leveldb::Snapshot* snapshot) {
   leveldb::ReadOptions read_options;
   read_options.verify_checksums = true;
   read_options.snapshot = snapshot;
   return std::unique_ptr<leveldb::Iterator>(db_->NewIterator(read_options));
 }
@@ skipping 14 matching lines @@
 void LevelDBDatabase::OnIteratorDestroyed(LevelDBIterator* iter) {
   DCHECK_GT(num_iterators_, 0u);
   --num_iterators_;
   auto it = iterator_lru_.Peek(iter);
   if (it == iterator_lru_.end())
     return;
   iterator_lru_.Erase(it);
 }
 
 }  // namespace content