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

components/leveldb_proto/leveldb_database.cc

 // Copyright 2014 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 "components/leveldb_proto/leveldb_database.h"
 
 #include <inttypes.h>
 
 #include <string>
 #include <vector>
@@ skipping 43 matching lines @@
   base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
       this);
 }
 
 bool LevelDB::InitWithOptions(const base::FilePath& database_dir,
                               const leveldb::Options& options) {
   DFAKE_SCOPED_LOCK(thread_checker_);
 
   std::string path = database_dir.AsUTF8Unsafe();
 
-  leveldb::DB* db = NULL;
-  leveldb::Status status = leveldb::DB::Open(options, path, &db);
+  leveldb::Status status = leveldb_env::OpenDB(options, path, &db_);
   if (open_histogram_)
     open_histogram_->Add(leveldb_env::GetLevelDBStatusUMAValue(status));
   if (status.IsCorruption()) {
     base::DeleteFile(database_dir, true);
-    status = leveldb::DB::Open(options, path, &db);
+    status = leveldb_env::OpenDB(options, path, &db_);
   }
 
   if (status.ok()) {
-    CHECK(db);

[pwnall, 2017/07/06 14:32:25]

Can you please leave the CHECK in? I think CHECK(db_) should do.

[DmitrySkiba, 2017/07/06 23:15:13]

I think this is better done on OpenDB() side - I've moved CHECK() there and
documented that it never returns NULL on success.

-    db_.reset(db);
-
     base::trace_event::MemoryDumpManager::GetInstance()
         ->RegisterDumpProviderWithSequencedTaskRunner(
             this, "LevelDB", base::SequencedTaskRunnerHandle::Get(),
             base::trace_event::MemoryDumpProvider::Options());
     return true;
   }
 
   LOG(WARNING) << "Unable to open " << database_dir.value() << ": "
                << status.ToString();
   return false;
@@ skipping 111 matching lines @@
       base::StringPrintf("leveldb/leveldb_proto/0x%" PRIXPTR,
                          reinterpret_cast<uintptr_t>(db_.get())));
   dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes, size);
   if (!client_name_.empty() &&
       dump_args.level_of_detail !=
           base::trace_event::MemoryDumpLevelOfDetail::BACKGROUND) {
     dump->AddString("client_name", "", client_name_);
   }
 
-  // Memory is allocated from system allocator (malloc).
-  const char* system_allocator_pool_name =
-      base::trace_event::MemoryDumpManager::GetInstance()
-          ->system_allocator_pool_name();
-  if (system_allocator_pool_name)
-    pmd->AddSuballocation(dump->guid(), system_allocator_pool_name);
+  // All leveldb databases are already dumped by leveldb_env::DBTracker. Add
+  // an edge to avoid double counting.
+  pmd->AddSuballocation(dump->guid(),
+                        leveldb_env::DBTracker::GetMemoryDumpName(db_.get()));
 
   return true;
 }
 
 }  // namespace leveldb_proto