Fix lifetime of leveldb::MojoEnv instances.

content/browser/browser_context.cc

 // Copyright (c) 2012 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/public/browser/browser_context.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <algorithm>
 #include <limits>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
+#include "base/debug/leak_annotations.h"
 #include "base/guid.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/rand_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
+#include "components/leveldb/env_mojo.h"
 #include "content/browser/blob_storage/chrome_blob_storage_context.h"
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/push_messaging/push_messaging_router.h"
 #include "content/browser/storage_partition_impl_map.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/public/browser/blob_handle.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
@@ skipping 417 matching lines @@
     browser_context->SetUserData(kServiceManagerConnection, connection_holder);
 
     ServiceManagerConnection* connection =
         connection_holder->service_manager_connection();
 
     // New embedded service factories should be added to |connection| here.
 
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kMojoLocalStorage)) {
       ServiceInfo info;
-      info.factory =
-          base::Bind(&file::CreateFileService,
-                     BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
-                     BrowserThread::GetTaskRunnerForThread(BrowserThread::DB));
+      auto* env = new leveldb::MojoEnv(
+              BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE));
+      ANNOTATE_LEAKING_OBJECT_PTR(env);
+      info.factory = base::Bind(
+          &file::CreateFileService,
+          env,
+          BrowserThread::GetTaskRunnerForThread(BrowserThread::DB));
       connection->AddEmbeddedService(file::mojom::kServiceName, info);
     }
 
     ContentBrowserClient::StaticServiceMap services;
     browser_context->RegisterInProcessServices(&services);
     for (const auto& entry : services) {
       connection->AddEmbeddedService(entry.first, entry.second);
     }
     connection->Start();
   }
@@ skipping 49 matching lines @@
   if (GetUserData(kDownloadManagerKeyName))
     GetDownloadManager(this)->Shutdown();
 }
 
 void BrowserContext::ShutdownStoragePartitions() {
   if (GetUserData(kStoragePartitionMapKeyName))
     RemoveUserData(kStoragePartitionMapKeyName);
 }
 
 }  // namespace content