Revert of Let SyncBackupManager keep backup data in memory until shutdown. Only persist

sync/internal_api/sync_backup_manager_unittest.cc

Index: sync/internal_api/sync_backup_manager_unittest.cc
diff --git a/sync/internal_api/sync_backup_manager_unittest.cc b/sync/internal_api/sync_backup_manager_unittest.cc
index 7c6c568b2ca205ce4fd2844902b7fe3c12bfbc58..e771ea32d847a5d5dffb5a3da31c74c55b7e0aff 100644
--- a/sync/internal_api/sync_backup_manager_unittest.cc
+++ b/sync/internal_api/sync_backup_manager_unittest.cc
@@ -49,8 +49,7 @@
     CHECK(temp_dir_.CreateUniqueTempDir());
   }
 
-  void InitManager(SyncManager* manager,
-                   InternalComponentsFactory::StorageOption storage_option) {
+  void InitManager(SyncManager* manager, StorageOption storage_option) {
     manager_ = manager;
     EXPECT_CALL(*this, OnInitializationComplete(_, _, _, _))
         .WillOnce(WithArgs<2>(Invoke(this,
@@ -66,11 +65,8 @@
     args.service_url = GURL("https://example.com/");
     args.post_factory = scoped_ptr<HttpPostProviderFactory>().Pass();
     args.internal_components_factory.reset(new TestInternalComponentsFactory(
-        InternalComponentsFactory::Switches(), storage_option,
-        &storage_used_));
+        InternalComponentsFactory::Switches(), storage_option));
     manager->Init(&args);
-    EXPECT_EQ(InternalComponentsFactory::STORAGE_ON_DISK_DEFERRED,
-              storage_used_);
     loop_.PostTask(FROM_HERE, run_loop.QuitClosure());
     run_loop.Run();
   }
@@ -86,6 +82,7 @@
               node.InitUniqueByCreation(type, type_root, client_tag));
   }
 
+ private:
   void ConfigureSyncer() {
     manager_->ConfigureSyncer(CONFIGURE_REASON_NEW_CLIENT,
                               ModelTypeSet(SEARCH_ENGINES),
@@ -108,12 +105,11 @@
   base::ScopedTempDir temp_dir_;
   base::MessageLoop loop_;    // Needed for WeakHandle
   SyncManager* manager_;
-  InternalComponentsFactory::StorageOption storage_used_;
 };
 
-TEST_F(SyncBackupManagerTest, NormalizeEntry) {
+TEST_F(SyncBackupManagerTest, NormalizeAndPersist) {
   scoped_ptr<SyncBackupManager> manager(new SyncBackupManager);
-  InitManager(manager.get(), InternalComponentsFactory::STORAGE_IN_MEMORY);
+  InitManager(manager.get(), STORAGE_ON_DISK);
 
   CreateEntry(manager->GetUserShare(), SEARCH_ENGINES, "test");
 
@@ -138,20 +134,11 @@
     EXPECT_TRUE(pref.GetEntry()->GetId().ServerKnows());
     EXPECT_FALSE(pref.GetEntry()->GetIsUnsynced());
   }
-}
-
-TEST_F(SyncBackupManagerTest, PersistWithSwitchToSyncShutdown) {
-  scoped_ptr<SyncBackupManager> manager(new SyncBackupManager);
-  InitManager(manager.get(),
-              InternalComponentsFactory::STORAGE_ON_DISK_DEFERRED);
-
-  CreateEntry(manager->GetUserShare(), SEARCH_ENGINES, "test");
-  manager->SaveChanges();
-  manager->ShutdownOnSyncThread(SWITCH_MODE_SYNC);
+  manager->ShutdownOnSyncThread(STOP_SYNC);
 
   // Reopen db to verify entry is persisted.
   manager.reset(new SyncBackupManager);
-  InitManager(manager.get(), InternalComponentsFactory::STORAGE_ON_DISK);
+  InitManager(manager.get(), STORAGE_ON_DISK);
   {
     ReadTransaction trans(FROM_HERE, manager->GetUserShare());
     ReadNode pref(&trans);
@@ -162,22 +149,10 @@
   }
 }
 
-TEST_F(SyncBackupManagerTest, DontPersistWithOtherShutdown) {
-  scoped_ptr<SyncBackupManager> manager(new SyncBackupManager);
-  InitManager(manager.get(),
-              InternalComponentsFactory::STORAGE_ON_DISK_DEFERRED);
-
-  CreateEntry(manager->GetUserShare(), SEARCH_ENGINES, "test");
-  manager->SaveChanges();
-  manager->ShutdownOnSyncThread(STOP_SYNC);
-  EXPECT_FALSE(base::PathExists(
-      temp_dir_.path().Append(syncable::Directory::kSyncDatabaseFilename)));
-}
-
 TEST_F(SyncBackupManagerTest, FailToInitialize) {
   // Test graceful shutdown on initialization failure.
   scoped_ptr<SyncBackupManager> manager(new SyncBackupManager);
-  InitManager(manager.get(), InternalComponentsFactory::STORAGE_INVALID);
+  InitManager(manager.get(), STORAGE_INVALID);
 }
 
 }  // anonymous namespace