| Index: components/leveldb/leveldb_service_unittest.cc
|
| diff --git a/components/leveldb/leveldb_service_unittest.cc b/components/leveldb/leveldb_service_unittest.cc
|
| index 28f37da1c2fb26c94bb7cd919083a285fdcd8c8a..0651b07a56f00b51f4ff9d346c7ae51709cf3cac 100644
|
| --- a/components/leveldb/leveldb_service_unittest.cc
|
| +++ b/components/leveldb/leveldb_service_unittest.cc
|
| @@ -144,9 +144,7 @@ class LevelDBServiceTest : public service_manager::test::ServiceTest {
|
| TEST_F(LevelDBServiceTest, Basic) {
|
| mojom::DatabaseError error;
|
| mojom::LevelDBDatabaseAssociatedPtr database;
|
| - LevelDBSyncOpenInMemory(leveldb().get(),
|
| - MakeRequest(&database, leveldb().associated_group()),
|
| - &error);
|
| + LevelDBSyncOpenInMemory(leveldb().get(), MakeRequest(&database), &error);
|
| EXPECT_EQ(mojom::DatabaseError::OK, error);
|
|
|
| // Write a key to the database.
|
| @@ -180,9 +178,7 @@ TEST_F(LevelDBServiceTest, Basic) {
|
| TEST_F(LevelDBServiceTest, WriteBatch) {
|
| mojom::DatabaseError error;
|
| mojom::LevelDBDatabaseAssociatedPtr database;
|
| - LevelDBSyncOpenInMemory(leveldb().get(),
|
| - MakeRequest(&database, leveldb().associated_group()),
|
| - &error);
|
| + LevelDBSyncOpenInMemory(leveldb().get(), MakeRequest(&database), &error);
|
| EXPECT_EQ(mojom::DatabaseError::OK, error);
|
|
|
| // Write a key to the database.
|
| @@ -268,10 +264,9 @@ TEST_F(LevelDBServiceTest, Reconnect) {
|
| options->error_if_exists = true;
|
| options->create_if_missing = true;
|
| base::RunLoop run_loop;
|
| - leveldb()->OpenWithOptions(
|
| - std::move(options), std::move(directory), "test",
|
| - MakeRequest(&database, leveldb().associated_group()),
|
| - Capture(&error, run_loop.QuitClosure()));
|
| + leveldb()->OpenWithOptions(std::move(options), std::move(directory), "test",
|
| + MakeRequest(&database),
|
| + Capture(&error, run_loop.QuitClosure()));
|
| run_loop.Run();
|
| EXPECT_EQ(mojom::DatabaseError::OK, error);
|
|
|
| @@ -290,8 +285,7 @@ TEST_F(LevelDBServiceTest, Reconnect) {
|
| // Reconnect to the database.
|
| mojom::LevelDBDatabaseAssociatedPtr database;
|
| base::RunLoop run_loop;
|
| - leveldb()->Open(std::move(directory), "test",
|
| - MakeRequest(&database, leveldb().associated_group()),
|
| + leveldb()->Open(std::move(directory), "test", MakeRequest(&database),
|
| Capture(&error, run_loop.QuitClosure()));
|
| run_loop.Run();
|
| EXPECT_EQ(mojom::DatabaseError::OK, error);
|
| @@ -320,10 +314,9 @@ TEST_F(LevelDBServiceTest, Destroy) {
|
| options->error_if_exists = true;
|
| options->create_if_missing = true;
|
| base::RunLoop run_loop;
|
| - leveldb()->OpenWithOptions(
|
| - std::move(options), std::move(directory), "test",
|
| - MakeRequest(&database, leveldb().associated_group()),
|
| - Capture(&error, run_loop.QuitClosure()));
|
| + leveldb()->OpenWithOptions(std::move(options), std::move(directory), "test",
|
| + MakeRequest(&database),
|
| + Capture(&error, run_loop.QuitClosure()));
|
| run_loop.Run();
|
| EXPECT_EQ(mojom::DatabaseError::OK, error);
|
|
|
| @@ -354,8 +347,7 @@ TEST_F(LevelDBServiceTest, Destroy) {
|
| // Reconnect to the database should fail.
|
| mojom::LevelDBDatabaseAssociatedPtr database;
|
| base::RunLoop run_loop;
|
| - leveldb()->Open(std::move(directory), "test",
|
| - MakeRequest(&database, leveldb().associated_group()),
|
| + leveldb()->Open(std::move(directory), "test", MakeRequest(&database),
|
| Capture(&error, run_loop.QuitClosure()));
|
| run_loop.Run();
|
| EXPECT_EQ(mojom::DatabaseError::INVALID_ARGUMENT, error);
|
| @@ -377,9 +369,7 @@ TEST_F(LevelDBServiceTest, Destroy) {
|
| TEST_F(LevelDBServiceTest, GetSnapshotSimple) {
|
| mojom::DatabaseError error;
|
| mojom::LevelDBDatabaseAssociatedPtr database;
|
| - LevelDBSyncOpenInMemory(leveldb().get(),
|
| - MakeRequest(&database, leveldb().associated_group()),
|
| - &error);
|
| + LevelDBSyncOpenInMemory(leveldb().get(), MakeRequest(&database), &error);
|
| EXPECT_EQ(mojom::DatabaseError::OK, error);
|
|
|
| base::UnguessableToken snapshot;
|
| @@ -392,9 +382,7 @@ TEST_F(LevelDBServiceTest, GetSnapshotSimple) {
|
| TEST_F(LevelDBServiceTest, GetFromSnapshots) {
|
| mojom::DatabaseError error;
|
| mojom::LevelDBDatabaseAssociatedPtr database;
|
| - LevelDBSyncOpenInMemory(leveldb().get(),
|
| - MakeRequest(&database, leveldb().associated_group()),
|
| - &error);
|
| + LevelDBSyncOpenInMemory(leveldb().get(), MakeRequest(&database), &error);
|
| EXPECT_EQ(mojom::DatabaseError::OK, error);
|
|
|
| // Write a key to the database.
|
| @@ -436,9 +424,7 @@ TEST_F(LevelDBServiceTest, GetFromSnapshots) {
|
| TEST_F(LevelDBServiceTest, InvalidArgumentOnInvalidSnapshot) {
|
| mojom::LevelDBDatabaseAssociatedPtr database;
|
| mojom::DatabaseError error = mojom::DatabaseError::INVALID_ARGUMENT;
|
| - LevelDBSyncOpenInMemory(leveldb().get(),
|
| - MakeRequest(&database, leveldb().associated_group()),
|
| - &error);
|
| + LevelDBSyncOpenInMemory(leveldb().get(), MakeRequest(&database), &error);
|
| EXPECT_EQ(mojom::DatabaseError::OK, error);
|
|
|
| base::UnguessableToken invalid_snapshot = base::UnguessableToken::Create();
|
| @@ -456,9 +442,7 @@ TEST_F(LevelDBServiceTest, InvalidArgumentOnInvalidSnapshot) {
|
| TEST_F(LevelDBServiceTest, MemoryDBReadWrite) {
|
| mojom::LevelDBDatabaseAssociatedPtr database;
|
| mojom::DatabaseError error = mojom::DatabaseError::INVALID_ARGUMENT;
|
| - LevelDBSyncOpenInMemory(leveldb().get(),
|
| - MakeRequest(&database, leveldb().associated_group()),
|
| - &error);
|
| + LevelDBSyncOpenInMemory(leveldb().get(), MakeRequest(&database), &error);
|
| EXPECT_EQ(mojom::DatabaseError::OK, error);
|
|
|
| // Write a key to the database.
|
| @@ -493,9 +477,7 @@ TEST_F(LevelDBServiceTest, Prefixed) {
|
| // Open an in memory database for speed.
|
| mojom::DatabaseError error = mojom::DatabaseError::INVALID_ARGUMENT;
|
| mojom::LevelDBDatabaseAssociatedPtr database;
|
| - LevelDBSyncOpenInMemory(leveldb().get(),
|
| - MakeRequest(&database, leveldb().associated_group()),
|
| - &error);
|
| + LevelDBSyncOpenInMemory(leveldb().get(), MakeRequest(&database), &error);
|
| EXPECT_EQ(mojom::DatabaseError::OK, error);
|
|
|
| const std::string prefix("prefix");
|
|
|