Fix lifetime of leveldb::MojoEnv instances.

components/leveldb/leveldb_database_impl.cc

 // Copyright 2016 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/leveldb_database_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/optional.h"
@@ skipping 16 matching lines @@
   for (; it->Valid(); it->Next()) {
     if (!it->key().starts_with(key_prefix))
       break;
     function(it->key(), it->value());
   }
   return it->status();
 }
 
 }  // namespace
 
-LevelDBDatabaseImpl::LevelDBDatabaseImpl(
-    std::unique_ptr<leveldb::Env> environment,
-    std::unique_ptr<leveldb::DB> db)
-    : environment_(std::move(environment)), db_(std::move(db)) {}
+LevelDBDatabaseImpl::LevelDBDatabaseImpl(std::unique_ptr<Env> owned_environment,
+                                         std::unique_ptr<DB> db)
+    : owned_environment_(std::move(owned_environment)), db_(std::move(db)) {}
+
+LevelDBDatabaseImpl::LevelDBDatabaseImpl(MojoEnv* environment,
+                                         std::string directory_prefix,
+                                         std::unique_ptr<leveldb::DB> db)
+    : environment_(environment),
+      directory_prefix_(std::move(directory_prefix)),
+      db_(std::move(db)) {}
 
 LevelDBDatabaseImpl::~LevelDBDatabaseImpl() {
   for (auto& p : iterator_map_)
     delete p.second;
   for (auto& p : snapshot_map_)
     db_->ReleaseSnapshot(p.second);
+  if (environment_) {
+    environment_->UnregisterDirectory(directory_prefix_);

[michaeln, 2017/03/27 20:24:10]

oh, the unreg call is far removed from the reg call?

[Marijn Kruisselbrink, 2017/03/31 23:26:24]

Yeah, before unreg happened in ~MojoEnv, but now that MojoEnv is no longer
destroyed it moved here...

+  }
 }
 
 void LevelDBDatabaseImpl::Put(const std::vector<uint8_t>& key,
                               const std::vector<uint8_t>& value,
                               const PutCallback& callback) {
   leveldb::Status status =
       db_->Put(leveldb::WriteOptions(), GetSliceFor(key), GetSliceFor(value));
   callback.Run(LeveldbStatusToError(status));
 }
 
@@ skipping 229 matching lines @@
     const leveldb::Slice& key_prefix,
     leveldb::WriteBatch* batch) {
   leveldb::Status status = ForEachWithPrefix(db_.get(), key_prefix,
       [batch](const leveldb::Slice& key, const leveldb::Slice& value) {
         batch->Delete(key);
       });
   return status;
 }
 
 }  // namespace leveldb