more upstream changes

git-svn-id: https://leveldb.googlecode.com/svn/trunk@10 62dab493-f737-651d-591e-8d6aee1b9529

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 {

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);
 
 }