leveldb_service: Attempt to fix deadlock on shutdown.

components/leveldb/leveldb_database_impl.cc

Index: components/leveldb/leveldb_database_impl.cc
diff --git a/components/leveldb/leveldb_database_impl.cc b/components/leveldb/leveldb_database_impl.cc
index d5e8fa690ea267cfbb92ac35b1684c6f8253803e..eae6717c0b33d957bb244162cadde07e2f83bf33 100644
--- a/components/leveldb/leveldb_database_impl.cc
+++ b/components/leveldb/leveldb_database_impl.cc
@@ -4,6 +4,9 @@
 
 #include "components/leveldb/leveldb_database_impl.h"
 
+#include <map>
+#include <string>
+
 #include "base/rand_util.h"
 #include "components/leveldb/env_mojo.h"
 #include "components/leveldb/util.h"
@@ -107,8 +110,10 @@ void LevelDBDatabaseImpl::GetFromSnapshot(uint64_t snapshot_id,
                                           const GetCallback& callback) {
   // If the snapshot id is invalid, send back invalid argument
   auto it = snapshot_map_.find(snapshot_id);
-  if (it == snapshot_map_.end())
+  if (it == snapshot_map_.end()) {
     callback.Run(DatabaseError::INVALID_ARGUMENT, mojo::Array<uint8_t>());
+    return;

[Elliot Glaysher, 2016/03/23 21:46:34]

This was just wrong on my part.

+  }
 
   std::string value;
   leveldb::ReadOptions options;