| Index: components/leveldb/leveldb_service_impl.cc
|
| diff --git a/components/leveldb/leveldb_service_impl.cc b/components/leveldb/leveldb_service_impl.cc
|
| index e3fd368af1777e58c2940ed07b90d3e322ff5090..2f754112c52baf46d511246fc17b64ccfca41600 100644
|
| --- a/components/leveldb/leveldb_service_impl.cc
|
| +++ b/components/leveldb/leveldb_service_impl.cc
|
| @@ -22,15 +22,10 @@ namespace leveldb {
|
|
|
| LevelDBServiceImpl::LevelDBServiceImpl(
|
| scoped_refptr<base::SingleThreadTaskRunner> file_task_runner)
|
| - : thread_(new LevelDBMojoProxy(std::move(file_task_runner))),
|
| - environment_name_("LevelDBEnv") {}
|
| + : thread_(new LevelDBMojoProxy(std::move(file_task_runner))) {}
|
|
|
| LevelDBServiceImpl::~LevelDBServiceImpl() {}
|
|
|
| -void LevelDBServiceImpl::SetEnvironmentName(const std::string& name) {
|
| - environment_name_ = name;
|
| -}
|
| -
|
| void LevelDBServiceImpl::Open(
|
| filesystem::mojom::DirectoryPtr directory,
|
| const std::string& dbname,
|
| @@ -60,8 +55,7 @@ void LevelDBServiceImpl::OpenWithOptions(
|
| LevelDBMojoProxy::OpaqueDir* dir =
|
| thread_->RegisterDirectory(std::move(directory));
|
|
|
| - std::unique_ptr<MojoEnv> env_mojo(
|
| - new MojoEnv(environment_name_, thread_, dir));
|
| + std::unique_ptr<MojoEnv> env_mojo(new MojoEnv(thread_, dir));
|
| options.env = env_mojo.get();
|
|
|
| leveldb::DB* db = nullptr;
|
| @@ -107,8 +101,7 @@ void LevelDBServiceImpl::Destroy(filesystem::mojom::DirectoryPtr directory,
|
| // 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));
|
| + std::unique_ptr<MojoEnv> env_mojo(new MojoEnv(thread_, dir));
|
| options.env = env_mojo.get();
|
| callback.Run(LeveldbStatusToError(leveldb::DestroyDB(dbname, options)));
|
| }
|
|
|