[SyncFS] Wire up MetadataDatabaseIndex to MetadataDatabase

chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc

 // Copyright 2013 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 "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h"
 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
+#include "chrome/browser/sync_file_system/drive_backend/metadata_database_index.h"
 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/env.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
 
 #define FPL(a) FILE_PATH_LITERAL(a)
 
@@ skipping 435 matching lines @@
   }
 
   void VerifyReloadConsistency() {
     scoped_ptr<MetadataDatabase> metadata_database_2;
     ASSERT_EQ(SYNC_STATUS_OK,
               MetadataDatabase::CreateForTesting(
                   metadata_database_->db_.Pass(),
                   &metadata_database_2));
     metadata_database_->db_ = metadata_database_2->db_.Pass();
 
+    const MetadataDatabaseIndex* on_memory =
+        metadata_database_->index_.get();
+    const MetadataDatabaseIndex* reloaded =
+        metadata_database_->index_.get();

[nhiroki, 2014/03/05 04:23:31]

metadata_database_ -> metadata_database_2

Can you run tests again after fixing this?

[tzik, 2014/03/05 04:36:05]

Thanks! Done!
Tests passed successfully after this fix.

+
     {
       SCOPED_TRACE("Expect equivalent service_metadata");
       ExpectEquivalent(metadata_database_->service_metadata_.get(),
                        metadata_database_2->service_metadata_.get());
     }
 
     {
       SCOPED_TRACE("Expect equivalent file_by_id_ contents.");
-      ExpectEquivalent(metadata_database_->metadata_by_id_,
-                       metadata_database_2->metadata_by_id_);
+      ExpectEquivalent(on_memory->metadata_by_id_,
+                       reloaded->metadata_by_id_);
     }
 
     {
       SCOPED_TRACE("Expect equivalent tracker_by_id_ contents.");
-      ExpectEquivalent(metadata_database_->tracker_by_id_,
-                       metadata_database_2->tracker_by_id_);
+      ExpectEquivalent(on_memory->tracker_by_id_,
+                       reloaded->tracker_by_id_);
     }
 
     {
       SCOPED_TRACE("Expect equivalent trackers_by_file_id_ contents.");
-      ExpectEquivalent(metadata_database_->trackers_by_file_id_,
-                       metadata_database_2->trackers_by_file_id_);
+      ExpectEquivalent(on_memory->trackers_by_file_id_,
+                       reloaded->trackers_by_file_id_);
     }
 
     {
       SCOPED_TRACE("Expect equivalent app_root_by_app_id_ contents.");
-      ExpectEquivalent(metadata_database_->app_root_by_app_id_,
-                       metadata_database_2->app_root_by_app_id_);
+      ExpectEquivalent(on_memory->app_root_by_app_id_,
+                       reloaded->app_root_by_app_id_);
     }
 
     {
       SCOPED_TRACE("Expect equivalent trackers_by_parent_and_title_ contents.");
-      ExpectEquivalent(metadata_database_->trackers_by_parent_and_title_,
-                       metadata_database_2->trackers_by_parent_and_title_);
+      ExpectEquivalent(on_memory->trackers_by_parent_and_title_,
+                       reloaded->trackers_by_parent_and_title_);
     }
 
     {
       SCOPED_TRACE("Expect equivalent dirty_trackers_ contents.");
-      ExpectEquivalent(metadata_database_->dirty_trackers_,
-                       metadata_database_2->dirty_trackers_);
+      ExpectEquivalent(on_memory->dirty_trackers_,
+                       reloaded->dirty_trackers_);
     }
   }
 
   void VerifyFile(const FileMetadata& file) {
     FileMetadata file_in_metadata_database;
     ASSERT_TRUE(metadata_database()->FindFileByFileID(
         file.file_id(), &file_in_metadata_database));
 
     SCOPED_TRACE("Expect equivalent " + file.file_id());
     ExpectEquivalent(&file, &file_in_metadata_database);
@@ skipping 630 matching lines @@
   EXPECT_TRUE(file->HasKey("details"));
 
   ASSERT_TRUE(files->GetDictionary(1, &file));
   EXPECT_TRUE(file->GetString("title", &str) && str == "file_0");
   EXPECT_TRUE(file->GetString("type", &str) && str == "file");
   EXPECT_TRUE(file->HasKey("details"));
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system