From 4bcb23118777b0666ad518c6b730a953d8f7bc89 Mon Sep 17 00:00:00 2001
From: "jorlow@chromium.org"
 <jorlow@chromium.org@62dab493-f737-651d-591e-8d6aee1b9529>
Date: Mon, 21 Mar 2011 21:06:49 +0000
Subject: [PATCH] more upstream changes

git-svn-id: https://leveldb.googlecode.com/svn/trunk@10 62dab493-f737-651d-591e-8d6aee1b9529
---
 port/port_chromium.cc | 1 -
 util/env_chromium.cc  | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/port/port_chromium.cc b/port/port_chromium.cc
index e25c1b78e..4026aa316 100644
--- a/port/port_chromium.cc
+++ b/port/port_chromium.cc
@@ -8,7 +8,6 @@
 
 #if defined(USE_SNAPPY)
 #  include "third_party/snappy/src/snappy.h"
-#  include "snappy-stubs-public.h"
 #endif
 
 namespace leveldb {
diff --git a/util/env_chromium.cc b/util/env_chromium.cc
index e39ac7139..49666f60c 100644
--- a/util/env_chromium.cc
+++ b/util/env_chromium.cc
@@ -594,10 +594,8 @@ void ChromiumEnv::StartThread(void (*function)(void* arg), void* arg) {
   new Thread(function, arg); // Will self-delete.
 }
 
-// TODO(jorlow): This won't co-exist with Chrome. Need to find a better way.
-::base::AtExitManager exit_manager;
-
-::base::LazyInstance<ChromiumEnv> default_env(::base::LINKER_INITIALIZED);
+::base::LazyInstance<ChromiumEnv, ::base::LeakyLazyInstanceTraits<ChromiumEnv> >
+    default_env(::base::LINKER_INITIALIZED);
 
 }
 
-- 
GitLab