Fix lifetime of leveldb::MojoEnv instances.

content/browser/dom_storage/local_storage_context_mojo_unittest.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 "content/browser/dom_storage/local_storage_context_mojo.h"
 
+#include "base/debug/leak_annotations.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.h"
+#include "components/leveldb/env_mojo.h"
 #include "components/leveldb/public/cpp/util.h"
 #include "content/browser/dom_storage/dom_storage_area.h"
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
 #include "content/browser/dom_storage/dom_storage_namespace.h"
 #include "content/browser/dom_storage/dom_storage_task_runner.h"
 #include "content/common/dom_storage/dom_storage_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/local_storage_usage_info.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/test/mock_leveldb_database.h"
@@ skipping 588 matching lines @@
 }
 
 namespace {
 
 class ServiceTestClient : public service_manager::test::ServiceTestClient,
                           public service_manager::mojom::ServiceFactory,
                           public service_manager::InterfaceFactory<
                               service_manager::mojom::ServiceFactory> {
  public:
   explicit ServiceTestClient(service_manager::test::ServiceTest* test)
-      : service_manager::test::ServiceTestClient(test) {
+      : service_manager::test::ServiceTestClient(test),
+        leveldb_env_(new leveldb::MojoEnv(
+            BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE))) {
+    ANNOTATE_LEAKING_OBJECT_PTR(leveldb_env_);
     registry_.AddInterface<service_manager::mojom::ServiceFactory>(this);
   }
   ~ServiceTestClient() override {}
 
  protected:
   void OnBindInterface(const service_manager::ServiceInfo& source_info,
                        const std::string& interface_name,
                        mojo::ScopedMessagePipeHandle interface_pipe) override {
     registry_.BindInterface(source_info.identity, interface_name,
                             std::move(interface_pipe));
   }
 
   void CreateService(service_manager::mojom::ServiceRequest request,
                      const std::string& name) override {
     if (name == file::mojom::kServiceName) {
       file_service_context_.reset(new service_manager::ServiceContext(
           file::CreateFileService(
-              BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
+              leveldb_env_,
               BrowserThread::GetTaskRunnerForThread(BrowserThread::DB)),
           std::move(request)));
     }
   }
 
   void Create(const service_manager::Identity& remote_identity,
               service_manager::mojom::ServiceFactoryRequest request) override {
     service_factory_bindings_.AddBinding(this, std::move(request));
   }
 
  private:
   service_manager::BinderRegistry registry_;
   mojo::BindingSet<service_manager::mojom::ServiceFactory>
       service_factory_bindings_;
   std::unique_ptr<service_manager::ServiceContext> file_service_context_;
+  leveldb::MojoEnv* leveldb_env_;
 };
 
 }  // namespace
 
 class LocalStorageContextMojoTestWithService
     : public service_manager::test::ServiceTest {
  public:
   LocalStorageContextMojoTestWithService()
       : ServiceTest("content_unittests", false),
         thread_bundle_(TestBrowserThreadBundle::REAL_FILE_THREAD) {}
@@ skipping 147 matching lines @@
   DoTestPut(context.get(), key, value);
   std::vector<uint8_t> result;
   EXPECT_TRUE(DoTestGet(context.get(), key, &result));
   EXPECT_EQ(value, result);
 
   context.reset();
   base::RunLoop().RunUntilIdle();
 
   {
     // Mess up version number in database.
-    leveldb_env::ChromiumEnv env;
     leveldb::DB* db = nullptr;
     leveldb::Options options;
-    options.env = &env;
     base::FilePath db_path =
         temp_path().Append(test_path).Append(FILE_PATH_LITERAL("leveldb"));
     ASSERT_TRUE(leveldb::DB::Open(options, db_path.AsUTF8Unsafe(), &db).ok());
     std::unique_ptr<leveldb::DB> db_owner(db);
     ASSERT_TRUE(db->Put(leveldb::WriteOptions(), "VERSION", "argh").ok());
   }
 
   // Make sure data is gone.
   context = base::MakeUnique<LocalStorageContextMojo>(
       connector(), nullptr, base::FilePath(), test_path);
   EXPECT_FALSE(DoTestGet(context.get(), key, &result));
 
   // Write data again.
   DoTestPut(context.get(), key, value);
 
   context.reset();
   base::RunLoop().RunUntilIdle();
 
   // Data should have been preserved now.
   context = base::MakeUnique<LocalStorageContextMojo>(
       connector(), nullptr, base::FilePath(), test_path);
   EXPECT_TRUE(DoTestGet(context.get(), key, &result));
   EXPECT_EQ(value, result);
 }
 
 }  // namespace content