leveldb_service: Attempt to fix deadlock on shutdown.

components/leveldb/leveldb_service_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 "base/macros.h"
 #include "components/filesystem/public/interfaces/directory.mojom.h"
 #include "components/filesystem/public/interfaces/file_system.mojom.h"
 #include "components/filesystem/public/interfaces/types.mojom.h"
 #include "components/leveldb/public/interfaces/leveldb.mojom.h"
 #include "mojo/common/common_type_converters.h"
@@ skipping 14 matching lines @@
   ~LevelDBApptest() override {}
 
  protected:
   // Overridden from mojo::test::ApplicationTestBase:
   void SetUp() override {
     ShellTest::SetUp();
     connector()->ConnectToInterface("mojo:filesystem", &files_);
     connector()->ConnectToInterface("mojo:leveldb", &leveldb_);
   }
 
+  void TearDown() override {
+    leveldb_.reset();
+    files_.reset();
+    ShellTest::TearDown();
+  }
+
   // Note: This has an out parameter rather than returning the |DirectoryPtr|,
   // since |ASSERT_...()| doesn't work with return values.
   void GetUserDataDir(filesystem::DirectoryPtr* directory) {
     FileError error = FileError::FAILED;
     files()->OpenPersistentFileSystem(GetProxy(directory),
                                       mojo::Capture(&error));
     ASSERT_TRUE(files().WaitForIncomingResponse());
     ASSERT_EQ(FileError::OK, error);
   }
 
   filesystem::FileSystemPtr& files() { return files_; }
   LevelDBServicePtr& leveldb() { return leveldb_; }
 
  private:
   filesystem::FileSystemPtr files_;
   LevelDBServicePtr leveldb_;
 
   DISALLOW_COPY_AND_ASSIGN(LevelDBApptest);
 };
 
-#if defined(OS_LINUX)
-// Flaky on Linux: http://crbug.com/594977,
-#define MAYBE_Basic DISABLED_Basic
-#else
-#define MAYBE_Basic Basic
-#endif
-TEST_F(LevelDBApptest, MAYBE_Basic) {
+TEST_F(LevelDBApptest, Basic) {
   filesystem::DirectoryPtr directory;
   GetUserDataDir(&directory);
 
   DatabaseError error;
   LevelDBDatabasePtr database;
   leveldb()->Open(std::move(directory), "test", GetProxy(&database),
                   Capture(&error));
   ASSERT_TRUE(leveldb().WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
 
@@ skipping 195 matching lines @@
   value.SetToEmpty();
   database->GetFromSnapshot(
       key_value_snapshot,
       mojo::Array<uint8_t>::From(std::string("key")),
       Capture(&error, &value));
   ASSERT_TRUE(database.WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
   EXPECT_EQ("value", value.To<std::string>());
 }
 
-#if defined(OS_LINUX)
-// Flaky on Linux: http://crbug.com/594977,
-#define MAYBE_InvalidArgumentOnInvalidSnapshot DISABLED_InvalidArgumentOnInvalidSnapshot
-#else
-#define MAYBE_InvalidArgumentOnInvalidSnapshot InvalidArgumentOnInvalidSnapshot
-#endif
 TEST_F(LevelDBApptest, InvalidArgumentOnInvalidSnapshot) {

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

Oddly enough, this test was never actually disabled; it just had some #defines
added in front of it which were never referred to.

   filesystem::DirectoryPtr directory;
   GetUserDataDir(&directory);
 
   LevelDBDatabasePtr database;
   DatabaseError error = DatabaseError::INVALID_ARGUMENT;
   leveldb()->Open(std::move(directory), "test", GetProxy(&database),
                   Capture(&error));
   ASSERT_TRUE(leveldb().WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
 
   uint64_t invalid_snapshot = 8;
 
   error = DatabaseError::OK;
   mojo::Array<uint8_t> value;
   database->GetFromSnapshot(
       invalid_snapshot,
       mojo::Array<uint8_t>::From(std::string("key")),
       Capture(&error, &value));
   ASSERT_TRUE(database.WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::INVALID_ARGUMENT, error);
 }
 
 }  // namespace
 }  // namespace leveldb