diff options
Diffstat (limited to 'chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc')
-rw-r--r-- | chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc index ef7879f..a7d0aa0 100644 --- a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc +++ b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc @@ -16,7 +16,6 @@ #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/sync/glue/device_info.h" -#include "chrome/browser/sync/glue/synced_device_tracker.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" @@ -630,16 +629,6 @@ TEST_F(SyncBackendHostTest, NewlySupportedTypesWithPartialTypes) { enabled_types_).Empty()); } -// Ensure the device info tracker is initialized properly on startup. -TEST_F(SyncBackendHostTest, InitializeDeviceInfo) { - ASSERT_EQ(NULL, backend_->GetSyncedDeviceTracker()); - - InitializeBackend(true); - const SyncedDeviceTracker* device_tracker = - backend_->GetSyncedDeviceTracker(); - ASSERT_TRUE(device_tracker->ReadLocalDeviceInfo()); -} - // Verify that downloading control types only downloads those types that do // not have initial sync ended set. TEST_F(SyncBackendHostTest, DownloadControlTypes) { @@ -647,7 +636,7 @@ TEST_F(SyncBackendHostTest, DownloadControlTypes) { // Set sync manager behavior before passing it down. Experiments and device // info are new types without progress markers or initial sync ended, while // all other types have been fully downloaded and applied. - syncer::ModelTypeSet new_types(syncer::EXPERIMENTS, syncer::DEVICE_INFO); + syncer::ModelTypeSet new_types(syncer::EXPERIMENTS, syncer::NIGORI); syncer::ModelTypeSet old_types = Difference(enabled_types_, new_types); fake_manager_factory_->set_progress_marker_types(old_types); |