| Index: content/browser/notifications/notification_database_unittest.cc
|
| diff --git a/content/browser/notifications/notification_database_unittest.cc b/content/browser/notifications/notification_database_unittest.cc
|
| index f02e0679c9e62c4695d7581b64bef6f1c1125ede..97430925ede3adf451303832599cb59db70ec9be 100644
|
| --- a/content/browser/notifications/notification_database_unittest.cc
|
| +++ b/content/browser/notifications/notification_database_unittest.cc
|
| @@ -128,7 +128,7 @@ TEST_F(NotificationDatabaseTest, OpenCloseFileSystem) {
|
| ASSERT_TRUE(database_dir.CreateUniqueTempDir());
|
|
|
| std::unique_ptr<NotificationDatabase> database(
|
| - CreateDatabaseOnFileSystem(database_dir.path()));
|
| + CreateDatabaseOnFileSystem(database_dir.GetPath()));
|
|
|
| // Should return false because the database does not exist on the file system.
|
| EXPECT_EQ(NotificationDatabase::STATUS_ERROR_NOT_FOUND,
|
| @@ -143,7 +143,7 @@ TEST_F(NotificationDatabaseTest, OpenCloseFileSystem) {
|
|
|
| // Close the database, and re-open it without attempting to create it because
|
| // the files on the file system should still exist as expected.
|
| - database.reset(CreateDatabaseOnFileSystem(database_dir.path()));
|
| + database.reset(CreateDatabaseOnFileSystem(database_dir.GetPath()));
|
| EXPECT_EQ(NotificationDatabase::STATUS_OK,
|
| database->Open(false /* create_if_missing */));
|
| }
|
| @@ -153,7 +153,7 @@ TEST_F(NotificationDatabaseTest, DestroyDatabase) {
|
| ASSERT_TRUE(database_dir.CreateUniqueTempDir());
|
|
|
| std::unique_ptr<NotificationDatabase> database(
|
| - CreateDatabaseOnFileSystem(database_dir.path()));
|
| + CreateDatabaseOnFileSystem(database_dir.GetPath()));
|
|
|
| EXPECT_EQ(NotificationDatabase::STATUS_OK,
|
| database->Open(true /* create_if_missing */));
|
| @@ -165,7 +165,7 @@ TEST_F(NotificationDatabaseTest, DestroyDatabase) {
|
|
|
| // Try to re-open the database (but not re-create it). This should fail as
|
| // the files associated with the database should have been blown away.
|
| - database.reset(CreateDatabaseOnFileSystem(database_dir.path()));
|
| + database.reset(CreateDatabaseOnFileSystem(database_dir.GetPath()));
|
| EXPECT_EQ(NotificationDatabase::STATUS_ERROR_NOT_FOUND,
|
| database->Open(false /* create_if_missing */));
|
| }
|
| @@ -175,7 +175,7 @@ TEST_F(NotificationDatabaseTest, NotificationIdIncrements) {
|
| ASSERT_TRUE(database_dir.CreateUniqueTempDir());
|
|
|
| std::unique_ptr<NotificationDatabase> database(
|
| - CreateDatabaseOnFileSystem(database_dir.path()));
|
| + CreateDatabaseOnFileSystem(database_dir.GetPath()));
|
|
|
| ASSERT_EQ(NotificationDatabase::STATUS_OK,
|
| database->Open(true /* create_if_missing */));
|
| @@ -196,7 +196,7 @@ TEST_F(NotificationDatabaseTest, NotificationIdIncrements) {
|
| 0 /* sw_registration_id */, ¬ification_id));
|
| EXPECT_EQ(notification_id, 2);
|
|
|
| - database.reset(CreateDatabaseOnFileSystem(database_dir.path()));
|
| + database.reset(CreateDatabaseOnFileSystem(database_dir.GetPath()));
|
| ASSERT_EQ(NotificationDatabase::STATUS_OK,
|
| database->Open(false /* create_if_missing */));
|
|
|
| @@ -235,7 +235,7 @@ TEST_F(NotificationDatabaseTest, NotificationIdCorruption) {
|
| ASSERT_TRUE(database_dir.CreateUniqueTempDir());
|
|
|
| std::unique_ptr<NotificationDatabase> database(
|
| - CreateDatabaseOnFileSystem(database_dir.path()));
|
| + CreateDatabaseOnFileSystem(database_dir.GetPath()));
|
|
|
| ASSERT_EQ(NotificationDatabase::STATUS_OK,
|
| database->Open(true /* create_if_missing */));
|
| @@ -256,7 +256,7 @@ TEST_F(NotificationDatabaseTest, NotificationIdCorruption) {
|
| ASSERT_NO_FATAL_FAILURE(
|
| WriteLevelDBKeyValuePair(database.get(), "NEXT_NOTIFICATION_ID", "-42"));
|
|
|
| - database.reset(CreateDatabaseOnFileSystem(database_dir.path()));
|
| + database.reset(CreateDatabaseOnFileSystem(database_dir.GetPath()));
|
| EXPECT_EQ(NotificationDatabase::STATUS_ERROR_CORRUPTED,
|
| database->Open(false /* create_if_missing */));
|
| }
|
|
|