[SyncFS] Wire up MetadataDatabaseIndex to MetadataDatabase

chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc

Index: chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
index 939ab7ccb5cb7d6a3f2f11aadcb61f0c92cbfeea..2517e65fbfc41ce664c0d33c72a5cb278f35697d 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
@@ -13,6 +13,7 @@
 #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"
@@ -468,6 +469,11 @@ class MetadataDatabaseTest : public testing::Test {
                   &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(),
@@ -476,38 +482,38 @@ class MetadataDatabaseTest : public testing::Test {
 
     {
       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_);
     }
   }