Fix lifetime of leveldb::MojoEnv instances.

components/leveldb/leveldb_service_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_service_impl.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "components/leveldb/env_mojo.h"
 #include "components/leveldb/leveldb_database_impl.h"
 #include "components/leveldb/public/cpp/util.h"
 #include "mojo/public/cpp/bindings/strong_associated_binding.h"
 #include "third_party/leveldatabase/env_chromium.h"
 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/env.h"
 #include "third_party/leveldatabase/src/include/leveldb/filter_policy.h"
 #include "third_party/leveldatabase/src/include/leveldb/slice.h"
 
 namespace leveldb {
 
-LevelDBServiceImpl::LevelDBServiceImpl(
-    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
-    : thread_(new LevelDBMojoProxy(std::move(file_task_runner))),
-      environment_name_("LevelDBEnv") {}
+LevelDBServiceImpl::LevelDBServiceImpl(MojoEnv* env) : env_(env) {}
 
 LevelDBServiceImpl::~LevelDBServiceImpl() {}
 
-void LevelDBServiceImpl::SetEnvironmentName(const std::string& name) {
-  environment_name_ = name;
-}
-
 void LevelDBServiceImpl::Open(
     filesystem::mojom::DirectoryPtr directory,
     const std::string& dbname,
     leveldb::mojom::LevelDBDatabaseAssociatedRequest database,
     const OpenCallback& callback) {
   OpenWithOptions(leveldb::mojom::OpenOptions::New(), std::move(directory),
                   dbname, std::move(database), callback);
 }
 
 void LevelDBServiceImpl::OpenWithOptions(
     leveldb::mojom::OpenOptionsPtr open_options,
     filesystem::mojom::DirectoryPtr directory,
     const std::string& dbname,
     leveldb::mojom::LevelDBDatabaseAssociatedRequest database,
     const OpenCallback& callback) {
   leveldb::Options options;
   options.create_if_missing = open_options->create_if_missing;
   options.error_if_exists = open_options->error_if_exists;
   options.paranoid_checks = open_options->paranoid_checks;
   options.write_buffer_size = open_options->write_buffer_size;
   options.max_open_files = open_options->max_open_files;
 
   options.reuse_logs = leveldb_env::kDefaultLogReuseOptionValue;
   options.compression = leveldb::kSnappyCompression;
 
-  // Register our directory with the file thread.
-  LevelDBMojoProxy::OpaqueDir* dir =
-      thread_->RegisterDirectory(std::move(directory));
-
-  std::unique_ptr<MojoEnv> env_mojo(
-      new MojoEnv(environment_name_, thread_, dir));
-  options.env = env_mojo.get();
+  std::unique_ptr<MojoEnv::Directory> dir =
+      env_->RegisterDirectory(std::move(directory));
+  options.env = env_;
 
   leveldb::DB* db = nullptr;
-  leveldb::Status s = leveldb::DB::Open(options, dbname, &db);
+  leveldb::Status s = leveldb::DB::Open(options, dir->prefix() + dbname, &db);
 
   if (s.ok()) {
-    mojo::MakeStrongAssociatedBinding(
-        base::MakeUnique<LevelDBDatabaseImpl>(std::move(env_mojo),
-                                              base::WrapUnique(db)),
-        std::move(database));
+    mojo::MakeStrongAssociatedBinding(base::MakeUnique<LevelDBDatabaseImpl>(
+                                          std::move(dir), base::WrapUnique(db)),
+                                      std::move(database));
   }
 
   callback.Run(LeveldbStatusToError(s));
 }
 
 void LevelDBServiceImpl::OpenInMemory(
     leveldb::mojom::LevelDBDatabaseAssociatedRequest database,
     const OpenCallback& callback) {
   leveldb::Options options;
   options.create_if_missing = true;
@@ skipping 12 matching lines @@
                                       std::move(database));
   }
 
   callback.Run(LeveldbStatusToError(s));
 }
 
 void LevelDBServiceImpl::Destroy(filesystem::mojom::DirectoryPtr directory,
                                  const std::string& dbname,
                                  const DestroyCallback& callback) {
   leveldb::Options options;
-  // Register our directory with the file thread.
-  LevelDBMojoProxy::OpaqueDir* dir =
-      thread_->RegisterDirectory(std::move(directory));
-  std::unique_ptr<MojoEnv> env_mojo(
-      new MojoEnv(environment_name_, thread_, dir));
-  options.env = env_mojo.get();
-  callback.Run(LeveldbStatusToError(leveldb::DestroyDB(dbname, options)));
+  std::unique_ptr<MojoEnv::Directory> dir =
+      env_->RegisterDirectory(std::move(directory));
+  options.env = env_;
+  callback.Run(LeveldbStatusToError(
+      leveldb::DestroyDB(dir->prefix() + dbname, options)));
 }
 
 }  // namespace leveldb