Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / drive_backend / metadata_database_index_unittest.cc

diff --git a/src/chrome/browser/sync_file_system/drive_backend/metadata_database_index_unittest.cc b/src/chrome/browser/sync_file_system/drive_backend/metadata_database_index_unittest.cc
index f10bf71..482c0dd 100644 (file)
--- a/src/chrome/browser/sync_file_system/drive_backend/metadata_database_index_unittest.cc
+++ b/src/chrome/browser/sync_file_system/drive_backend/metadata_database_index_unittest.cc
@@ -31,7 +31,8 @@ scoped_ptr<DatabaseContents> CreateTestDatabaseContents() {
       test_util::CreateFolderMetadata("sync_root_folder_id",
                                       "Chrome Syncable FileSystem");
   scoped_ptr<FileTracker> sync_root_tracker =
-      test_util::CreateTracker(*sync_root_metadata, kSyncRootTrackerID, NULL);
+      test_util::CreateTracker(*sync_root_metadata, kSyncRootTrackerID,
+                               nullptr);
 
   scoped_ptr<FileMetadata> app_root_metadata =
       test_util::CreateFolderMetadata("app_root_folder_id", "app_id");
@@ -66,7 +67,7 @@ scoped_ptr<DatabaseContents> CreateTestDatabaseContents() {
 
 class MetadataDatabaseIndexTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
     InitializeLevelDB();
 
@@ -79,7 +80,7 @@ class MetadataDatabaseIndexTest : public testing::Test {
 
  private:
   void InitializeLevelDB() {
-    leveldb::DB* db = NULL;
+    leveldb::DB* db = nullptr;
     leveldb::Options options;
     options.create_if_missing = true;
     options.max_open_files = 0;  // Use minimum.
@@ -99,13 +100,13 @@ class MetadataDatabaseIndexTest : public testing::Test {
 
 TEST_F(MetadataDatabaseIndexTest, GetEntryTest) {
   FileTracker tracker;
-  EXPECT_FALSE(index()->GetFileTracker(kInvalidTrackerID, NULL));
+  EXPECT_FALSE(index()->GetFileTracker(kInvalidTrackerID, nullptr));
   ASSERT_TRUE(index()->GetFileTracker(kFileTrackerID, &tracker));
   EXPECT_EQ(kFileTrackerID, tracker.tracker_id());
   EXPECT_EQ("file_id", tracker.file_id());
 
   FileMetadata metadata;
-  EXPECT_FALSE(index()->GetFileMetadata(std::string(), NULL));
+  EXPECT_FALSE(index()->GetFileMetadata(std::string(), nullptr));
   ASSERT_TRUE(index()->GetFileMetadata("file_id", &metadata));
   EXPECT_EQ("file_id", metadata.file_id());
 }
@@ -132,7 +133,9 @@ TEST_F(MetadataDatabaseIndexTest, IndexLookUpTest) {
 }
 
 TEST_F(MetadataDatabaseIndexTest, UpdateTest) {
+  EXPECT_FALSE(index()->IsDemotedDirtyTracker(kPlaceholderTrackerID));
   index()->DemoteDirtyTracker(kPlaceholderTrackerID);
+  EXPECT_TRUE(index()->IsDemotedDirtyTracker(kPlaceholderTrackerID));
   EXPECT_EQ(kInvalidTrackerID, index()->PickDirtyTracker());
   index()->PromoteDemotedDirtyTrackers();
   EXPECT_EQ(kPlaceholderTrackerID, index()->PickDirtyTracker());
@@ -155,8 +158,8 @@ TEST_F(MetadataDatabaseIndexTest, UpdateTest) {
   index()->RemoveFileMetadata("file_id");
   index()->RemoveFileTracker(kFileTrackerID);
 
-  EXPECT_FALSE(index()->GetFileMetadata("file_id", NULL));
-  EXPECT_FALSE(index()->GetFileTracker(kFileTrackerID, NULL));
+  EXPECT_FALSE(index()->GetFileMetadata("file_id", nullptr));
+  EXPECT_FALSE(index()->GetFileTracker(kFileTrackerID, nullptr));
 }
 
 }  // namespace drive_backend