mojo filesystem: Further clean ups.

components/leveldb/leveldb_apptest.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"
 #include "mojo/public/cpp/bindings/weak_binding_set.h"
 #include "mojo/shell/public/cpp/application_test_base.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/util/capture_util.h"
 
 using filesystem::FileError;
 using mojo::Capture;
 
 namespace leveldb {
 namespace {
 
-class LevelDBApptest : public mojo::test::ApplicationTestBase,
-                       public filesystem::FileSystemClient {
+class LevelDBApptest : public mojo::test::ApplicationTestBase {
  public:
   LevelDBApptest() {}
   ~LevelDBApptest() override {}
 
  protected:
   // Overridden from mojo::test::ApplicationTestBase:
   void SetUp() override {
     ApplicationTestBase::SetUp();
     shell()->ConnectToInterface("mojo:filesystem", &files_);
     shell()->ConnectToInterface("mojo:leveldb", &leveldb_);
   }
 
-  // Overridden from FileSystemClient:
-  void OnFileSystemShutdown() override {}
-
   // Note: This has an out parameter rather than returning the |DirectoryPtr|,
   // since |ASSERT_...()| doesn't work with return values.
-  void GetOriginRoot(filesystem::DirectoryPtr* directory) {
+  void GetUserDataDir(filesystem::DirectoryPtr* directory) {
     FileError error = FileError::FAILED;
-    files()->OpenFileSystem("origin", GetProxy(directory),
-                            bindings_.CreateInterfacePtrAndBind(this),
-                            mojo::Capture(&error));
+    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:
-  mojo::WeakBindingSet<filesystem::FileSystemClient> bindings_;
-
   filesystem::FileSystemPtr files_;
   LevelDBServicePtr leveldb_;
 
   DISALLOW_COPY_AND_ASSIGN(LevelDBApptest);
 };
 
 TEST_F(LevelDBApptest, Basic) {
   filesystem::DirectoryPtr directory;
-  GetOriginRoot(&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);
 
   // Write a key to the database.
   error = DatabaseError::INVALID_ARGUMENT;
@@ skipping 24 matching lines @@
   value.SetToEmpty();
   database->Get(mojo::Array<uint8_t>::From(std::string("key")),
                 Capture(&error, &value));
   ASSERT_TRUE(database.WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::NOT_FOUND, error);
   EXPECT_EQ("", value.To<std::string>());
 }
 
 TEST_F(LevelDBApptest, WriteBatch) {
   filesystem::DirectoryPtr directory;
-  GetOriginRoot(&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);
 
   // Write a key to the database.
   database->Put(mojo::Array<uint8_t>::From(std::string("key")),
@@ skipping 35 matching lines @@
   ASSERT_TRUE(database.WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
   EXPECT_EQ("more", value.To<std::string>());
 }
 
 TEST_F(LevelDBApptest, Reconnect) {
   DatabaseError error;
 
   {
     filesystem::DirectoryPtr directory;
-    GetOriginRoot(&directory);
+    GetUserDataDir(&directory);
 
     LevelDBDatabasePtr database;
     leveldb()->Open(std::move(directory), "test", GetProxy(&database),
                     Capture(&error));
     ASSERT_TRUE(leveldb().WaitForIncomingResponse());
     EXPECT_EQ(DatabaseError::OK, error);
 
     // Write a key to the database.
     error = DatabaseError::INVALID_ARGUMENT;
     database->Put(mojo::Array<uint8_t>::From(std::string("key")),
                   mojo::Array<uint8_t>::From(std::string("value")),
                   Capture(&error));
     ASSERT_TRUE(database.WaitForIncomingResponse());
     EXPECT_EQ(DatabaseError::OK, error);
 
     // The database should go out of scope here.
   }
 
   {
     filesystem::DirectoryPtr directory;
-    GetOriginRoot(&directory);
+    GetUserDataDir(&directory);
 
     // Reconnect to the database.
     LevelDBDatabasePtr database;
     leveldb()->Open(std::move(directory), "test", GetProxy(&database),
                     Capture(&error));
     ASSERT_TRUE(leveldb().WaitForIncomingResponse());
     EXPECT_EQ(DatabaseError::OK, error);
 
     // We should still be able to read the key back from the database.
     error = DatabaseError::INVALID_ARGUMENT;
     mojo::Array<uint8_t> value;
     database->Get(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>());
   }
 }
 
 TEST_F(LevelDBApptest, GetSnapshotSimple) {
   DatabaseError error;
 
   filesystem::DirectoryPtr directory;
-  GetOriginRoot(&directory);
+  GetUserDataDir(&directory);
 
   LevelDBDatabasePtr database;
   leveldb()->Open(std::move(directory), "test", GetProxy(&database),
                   Capture(&error));
   ASSERT_TRUE(leveldb().WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
 
   uint64_t snapshot_id = 0;
   database->GetSnapshot(Capture(&snapshot_id));
   ASSERT_TRUE(database.WaitForIncomingResponse());
   EXPECT_NE(static_cast<uint64_t>(0), snapshot_id);
 }
 
 TEST_F(LevelDBApptest, GetFromSnapshots) {
   DatabaseError error;
 
   filesystem::DirectoryPtr directory;
-  GetOriginRoot(&directory);
+  GetUserDataDir(&directory);
 
   LevelDBDatabasePtr database;
   leveldb()->Open(std::move(directory), "test", GetProxy(&database),
                   Capture(&error));
   ASSERT_TRUE(leveldb().WaitForIncomingResponse());
   EXPECT_EQ(DatabaseError::OK, error);
 
   // Write a key to the database.
   error = DatabaseError::INVALID_ARGUMENT;
   database->Put(mojo::Array<uint8_t>::From(std::string("key")),
@@ skipping 31 matching lines @@
       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>());
 }
 
 TEST_F(LevelDBApptest, InvalidArgumentOnInvalidSnapshot) {
   filesystem::DirectoryPtr directory;
-  GetOriginRoot(&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