Componentize SyncBackendHostImpl unittest

chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc

Index: chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
diff --git a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
deleted file mode 100644
index befa35ba6a879075c45bf9387ca8f6ecc2b9e582..0000000000000000000000000000000000000000
--- a/chrome/browser/sync/glue/sync_backend_host_impl_unittest.cc
+++ /dev/null
@@ -1,866 +0,0 @@
-// 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 "components/sync_driver/glue/sync_backend_host_impl.h"
-
-#include <cstddef>
-
-#include "base/files/file_util.h"
-#include "base/location.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
-#include "base/synchronization/waitable_event.h"
-#include "base/test/test_timeouts.h"
-#include "base/time/time.h"
-#include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
-#include "chrome/browser/sync/profile_sync_test_util.h"
-#include "chrome/test/base/testing_browser_process.h"
-#include "chrome/test/base/testing_profile.h"
-#include "chrome/test/base/testing_profile_manager.h"
-#include "components/invalidation/impl/invalidator_storage.h"
-#include "components/invalidation/impl/profile_invalidation_provider.h"
-#include "components/invalidation/public/invalidator_state.h"
-#include "components/invalidation/public/object_id_invalidation_map.h"
-#include "components/sync_driver/device_info.h"
-#include "components/sync_driver/fake_sync_client.h"
-#include "components/sync_driver/sync_frontend.h"
-#include "components/sync_driver/sync_prefs.h"
-#include "components/syncable_prefs/pref_service_syncable.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/test/test_browser_thread_bundle.h"
-#include "content/public/test/test_utils.h"
-#include "google/cacheinvalidation/include/types.h"
-#include "google_apis/gaia/gaia_constants.h"
-#include "net/url_request/test_url_fetcher_factory.h"
-#include "net/url_request/url_request_context_getter.h"
-#include "sync/internal_api/public/base/model_type.h"
-#include "sync/internal_api/public/engine/model_safe_worker.h"
-#include "sync/internal_api/public/engine/passive_model_worker.h"
-#include "sync/internal_api/public/http_bridge_network_resources.h"
-#include "sync/internal_api/public/network_resources.h"
-#include "sync/internal_api/public/sessions/commit_counters.h"
-#include "sync/internal_api/public/sessions/status_counters.h"
-#include "sync/internal_api/public/sessions/update_counters.h"
-#include "sync/internal_api/public/sync_manager_factory.h"
-#include "sync/internal_api/public/test/fake_sync_manager.h"
-#include "sync/internal_api/public/util/experiments.h"
-#include "sync/protocol/encryption.pb.h"
-#include "sync/protocol/sync_protocol_error.h"
-#include "sync/test/callback_counter.h"
-#include "sync/util/test_unrecoverable_error_handler.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "url/gurl.h"
-
-using content::BrowserThread;
-using syncer::FakeSyncManager;
-using syncer::SyncManager;
-using ::testing::InvokeWithoutArgs;
-using ::testing::StrictMock;
-using ::testing::_;
-
-namespace browser_sync {
-
-namespace {
-
-const char kTestProfileName[] = "test-profile";
-
-static const base::FilePath::CharType kTestSyncDir[] =
-    FILE_PATH_LITERAL("sync-test");
-
-ACTION_P(Signal, event) {
-  event->Signal();
-}
-
-void QuitMessageLoop() {
-  base::MessageLoop::current()->QuitWhenIdle();
-}
-
-class MockSyncFrontend : public sync_driver::SyncFrontend {
- public:
-  virtual ~MockSyncFrontend() {}
-
-  MOCK_METHOD4(
-      OnBackendInitialized,
-      void(const syncer::WeakHandle<syncer::JsBackend>&,
-           const syncer::WeakHandle<syncer::DataTypeDebugInfoListener>&,
-           const std::string&,
-           bool));
-  MOCK_METHOD0(OnSyncCycleCompleted, void());
-  MOCK_METHOD1(OnConnectionStatusChange,
-               void(syncer::ConnectionStatus status));
-  MOCK_METHOD0(OnClearServerDataSucceeded, void());
-  MOCK_METHOD0(OnClearServerDataFailed, void());
-  MOCK_METHOD2(OnPassphraseRequired,
-               void(syncer::PassphraseRequiredReason,
-                    const sync_pb::EncryptedData&));
-  MOCK_METHOD0(OnPassphraseAccepted, void());
-  MOCK_METHOD2(OnEncryptedTypesChanged,
-               void(syncer::ModelTypeSet, bool));
-  MOCK_METHOD0(OnEncryptionComplete, void());
-  MOCK_METHOD1(OnMigrationNeededForTypes, void(syncer::ModelTypeSet));
-  MOCK_METHOD1(OnProtocolEvent, void(const syncer::ProtocolEvent&));
-  MOCK_METHOD2(OnDirectoryTypeCommitCounterUpdated,
-               void(syncer::ModelType, const syncer::CommitCounters&));
-  MOCK_METHOD2(OnDirectoryTypeUpdateCounterUpdated,
-               void(syncer::ModelType, const syncer::UpdateCounters&));
-  MOCK_METHOD2(OnDirectoryTypeStatusCounterUpdated,
-               void(syncer::ModelType, const syncer::StatusCounters&));
-  MOCK_METHOD1(OnExperimentsChanged,
-      void(const syncer::Experiments&));
-  MOCK_METHOD1(OnActionableError,
-      void(const syncer::SyncProtocolError& sync_error));
-  MOCK_METHOD0(OnSyncConfigureRetry, void());
-  MOCK_METHOD1(
-      OnLocalSetPassphraseEncryption,
-      void(const syncer::SyncEncryptionHandler::NigoriState& nigori_state));
-};
-
-class FakeSyncManagerFactory : public syncer::SyncManagerFactory {
- public:
-  explicit FakeSyncManagerFactory(FakeSyncManager** fake_manager)
-     : SyncManagerFactory(NORMAL),
-       fake_manager_(fake_manager) {
-    *fake_manager_ = NULL;
-  }
-  ~FakeSyncManagerFactory() override {}
-
-  // SyncManagerFactory implementation.  Called on the sync thread.
-  scoped_ptr<SyncManager> CreateSyncManager(
-      const std::string& /* name */) override {
-    *fake_manager_ = new FakeSyncManager(initial_sync_ended_types_,
-                                         progress_marker_types_,
-                                         configure_fail_types_);
-    return scoped_ptr<SyncManager>(*fake_manager_);
-  }
-
-  void set_initial_sync_ended_types(syncer::ModelTypeSet types) {
-    initial_sync_ended_types_ = types;
-  }
-
-  void set_progress_marker_types(syncer::ModelTypeSet types) {
-    progress_marker_types_ = types;
-  }
-
-  void set_configure_fail_types(syncer::ModelTypeSet types) {
-    configure_fail_types_ = types;
-  }
-
- private:
-  syncer::ModelTypeSet initial_sync_ended_types_;
-  syncer::ModelTypeSet progress_marker_types_;
-  syncer::ModelTypeSet configure_fail_types_;
-  FakeSyncManager** fake_manager_;
-};
-
-class BackendSyncClient : public sync_driver::FakeSyncClient {
- public:
-  scoped_refptr<syncer::ModelSafeWorker> CreateModelWorkerForGroup(
-      syncer::ModelSafeGroup group,
-      syncer::WorkerLoopDestructionObserver* observer) override {
-    switch (group) {
-      case syncer::GROUP_PASSIVE:
-        return new syncer::PassiveModelWorker(observer);
-      default:
-        return nullptr;
-    }
-  }
-};
-
-class SyncBackendHostTest : public testing::Test {
- protected:
-  SyncBackendHostTest()
-      : thread_bundle_(content::TestBrowserThreadBundle::REAL_IO_THREAD),
-        profile_manager_(TestingBrowserProcess::GetGlobal()),
-        fake_manager_(NULL) {}
-
-  ~SyncBackendHostTest() override {}
-
-  void SetUp() override {
-    ASSERT_TRUE(profile_manager_.SetUp());
-    profile_ = profile_manager_.CreateTestingProfile(kTestProfileName);
-    sync_prefs_.reset(new sync_driver::SyncPrefs(profile_->GetPrefs()));
-    backend_.reset(new SyncBackendHostImpl(
-        profile_->GetDebugName(), &sync_client_,
-        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
-        invalidation::ProfileInvalidationProviderFactory::GetForProfile(
-            profile_)
-            ->GetInvalidationService(),
-        sync_prefs_->AsWeakPtr(),
-        profile_->GetPath().Append(base::FilePath(kTestSyncDir))));
-    credentials_.email = "user@example.com";
-    credentials_.sync_token = "sync_token";
-    credentials_.scope_set.insert(GaiaConstants::kChromeSyncOAuth2Scope);
-
-    fake_manager_factory_.reset(new FakeSyncManagerFactory(&fake_manager_));
-
-    // These types are always implicitly enabled.
-    enabled_types_.PutAll(syncer::ControlTypes());
-
-    // NOTE: We can't include Passwords or Typed URLs due to the Sync Backend
-    // Registrar removing them if it can't find their model workers.
-    enabled_types_.Put(syncer::BOOKMARKS);
-    enabled_types_.Put(syncer::PREFERENCES);
-    enabled_types_.Put(syncer::SESSIONS);
-    enabled_types_.Put(syncer::SEARCH_ENGINES);
-    enabled_types_.Put(syncer::AUTOFILL);
-
-    network_resources_.reset(new syncer::HttpBridgeNetworkResources());
-  }
-
-  void TearDown() override {
-    if (backend_) {
-      backend_->StopSyncingForShutdown();
-      backend_->Shutdown(syncer::STOP_SYNC);
-    }
-    backend_.reset();
-    sync_prefs_.reset();
-    profile_ = NULL;
-    profile_manager_.DeleteTestingProfile(kTestProfileName);
-    // Pump messages posted by the sync thread (which may end up
-    // posting on the IO thread).
-    base::RunLoop().RunUntilIdle();
-    content::RunAllPendingInMessageLoop(BrowserThread::IO);
-    // Pump any messages posted by the IO thread.
-    base::RunLoop().RunUntilIdle();
-  }
-
-  // Synchronously initializes the backend.
-  void InitializeBackend(bool expect_success) {
-    EXPECT_CALL(mock_frontend_, OnBackendInitialized(_, _, _, expect_success)).
-        WillOnce(InvokeWithoutArgs(QuitMessageLoop));
-    SyncBackendHost::HttpPostProviderFactoryGetter
-        http_post_provider_factory_getter =
-            base::Bind(&syncer::NetworkResources::GetHttpPostProviderFactory,
-                       base::Unretained(network_resources_.get()),
-                       make_scoped_refptr(profile_->GetRequestContext()),
-                       base::Bind(&EmptyNetworkTimeUpdate));
-    backend_->Initialize(
-        &mock_frontend_, scoped_ptr<base::Thread>(),
-        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
-        BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
-        syncer::WeakHandle<syncer::JsEventHandler>(), GURL(std::string()),
-        std::string(), credentials_, true, fake_manager_factory_.Pass(),
-        MakeWeakHandle(test_unrecoverable_error_handler_.GetWeakPtr()),
-        base::Closure(), http_post_provider_factory_getter,
-        saved_nigori_state_.Pass());
-    base::RunLoop run_loop;
-    BrowserThread::PostDelayedTask(BrowserThread::UI, FROM_HERE,
-                                   run_loop.QuitClosure(),
-                                   TestTimeouts::action_timeout());
-    run_loop.Run();
-    // |fake_manager_factory_|'s fake_manager() is set on the sync
-    // thread, but we can rely on the message loop barriers to
-    // guarantee that we see the updated value.
-    DCHECK(fake_manager_);
-  }
-
-  // Synchronously configures the backend's datatypes.
-  syncer::ModelTypeSet ConfigureDataTypes(
-      syncer::ModelTypeSet types_to_add,
-      syncer::ModelTypeSet types_to_remove,
-      syncer::ModelTypeSet types_to_unapply) {
-    sync_driver::BackendDataTypeConfigurer::DataTypeConfigStateMap
-        config_state_map;
-    sync_driver::BackendDataTypeConfigurer::SetDataTypesState(
-        sync_driver::BackendDataTypeConfigurer::CONFIGURE_ACTIVE,
-        types_to_add,
-        &config_state_map);
-    sync_driver::BackendDataTypeConfigurer::SetDataTypesState(
-        sync_driver::BackendDataTypeConfigurer::DISABLED,
-        types_to_remove, &config_state_map);
-    sync_driver::BackendDataTypeConfigurer::SetDataTypesState(
-        sync_driver::BackendDataTypeConfigurer::UNREADY,
-        types_to_unapply, &config_state_map);
-
-    types_to_add.PutAll(syncer::ControlTypes());
-    syncer::ModelTypeSet ready_types = backend_->ConfigureDataTypes(
-        syncer::CONFIGURE_REASON_RECONFIGURATION, config_state_map,
-        base::Bind(&SyncBackendHostTest::DownloadReady, base::Unretained(this)),
-        base::Bind(&SyncBackendHostTest::OnDownloadRetry,
-                   base::Unretained(this)));
-    base::RunLoop run_loop;
-    BrowserThread::PostDelayedTask(BrowserThread::UI, FROM_HERE,
-                                   run_loop.QuitClosure(),
-                                   TestTimeouts::action_timeout());
-    run_loop.Run();
-    return ready_types;
-  }
-
- protected:
-  void DownloadReady(syncer::ModelTypeSet succeeded_types,
-                     syncer::ModelTypeSet failed_types) {
-    base::MessageLoop::current()->QuitWhenIdle();
-  }
-
-  void OnDownloadRetry() {
-    NOTIMPLEMENTED();
-  }
-
-  content::TestBrowserThreadBundle thread_bundle_;
-  StrictMock<MockSyncFrontend> mock_frontend_;
-  syncer::SyncCredentials credentials_;
-  TestingProfileManager profile_manager_;
-  TestingProfile* profile_;
-  BackendSyncClient sync_client_;
-  syncer::TestUnrecoverableErrorHandler test_unrecoverable_error_handler_;
-  scoped_ptr<sync_driver::SyncPrefs> sync_prefs_;
-  scoped_ptr<SyncBackendHostImpl> backend_;
-  scoped_ptr<FakeSyncManagerFactory> fake_manager_factory_;
-  FakeSyncManager* fake_manager_;
-  syncer::ModelTypeSet enabled_types_;
-  scoped_ptr<syncer::NetworkResources> network_resources_;
-  scoped_ptr<syncer::SyncEncryptionHandler::NigoriState> saved_nigori_state_;
-};
-
-// Test basic initialization with no initial types (first time initialization).
-// Only the nigori should be configured.
-TEST_F(SyncBackendHostTest, InitShutdown) {
-  InitializeBackend(true);
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(
-      syncer::ControlTypes()));
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(
-      syncer::ControlTypes()));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      syncer::ControlTypes()).Empty());
-}
-
-// Test first time sync scenario. All types should be properly configured.
-TEST_F(SyncBackendHostTest, FirstTimeSync) {
-  InitializeBackend(true);
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(
-      syncer::ControlTypes()));
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(
-      syncer::ControlTypes()));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      syncer::ControlTypes()).Empty());
-
-  syncer::ModelTypeSet ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-  // Nigori is always downloaded so won't be ready.
-  EXPECT_TRUE(ready_types.Equals(syncer::Difference(
-      syncer::ControlTypes(),
-      syncer::ModelTypeSet(syncer::NIGORI))));
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().HasAll(
-      Difference(enabled_types_, syncer::ControlTypes())));
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetAndResetEnabledTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Empty());
-}
-
-// Test the restart after setting up sync scenario. No enabled types should be
-// downloaded or cleaned.
-TEST_F(SyncBackendHostTest, Restart) {
-  sync_prefs_->SetSyncSetupCompleted();
-  syncer::ModelTypeSet all_but_nigori = enabled_types_;
-  fake_manager_factory_->set_progress_marker_types(enabled_types_);
-  fake_manager_factory_->set_initial_sync_ended_types(enabled_types_);
-  InitializeBackend(true);
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Empty());
-  EXPECT_TRUE(Intersection(fake_manager_->GetAndResetCleanedTypes(),
-                           enabled_types_).Empty());
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Empty());
-
-  syncer::ModelTypeSet ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-  EXPECT_TRUE(ready_types.Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Empty());
-  EXPECT_TRUE(Intersection(fake_manager_->GetAndResetCleanedTypes(),
-                           enabled_types_).Empty());
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetAndResetEnabledTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Empty());
-}
-
-// Test a sync restart scenario where some types had never finished configuring.
-// The partial types should be purged, then reconfigured properly.
-TEST_F(SyncBackendHostTest, PartialTypes) {
-  sync_prefs_->SetSyncSetupCompleted();
-  // Set sync manager behavior before passing it down. All types have progress
-  // markers, but nigori and bookmarks are missing initial sync ended.
-  syncer::ModelTypeSet partial_types(syncer::NIGORI, syncer::BOOKMARKS);
-  syncer::ModelTypeSet full_types =
-      Difference(enabled_types_, partial_types);
-  fake_manager_factory_->set_progress_marker_types(enabled_types_);
-  fake_manager_factory_->set_initial_sync_ended_types(full_types);
-
-  // Bringing up the backend should purge all partial types, then proceed to
-  // download the Nigori.
-  InitializeBackend(true);
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(
-      syncer::ModelTypeSet(syncer::NIGORI)));
-  EXPECT_TRUE(fake_manager_->GetAndResetCleanedTypes().HasAll(partial_types));
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(
-      Union(full_types, syncer::ModelTypeSet(syncer::NIGORI))));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Equals(
-          Difference(partial_types, syncer::ModelTypeSet(syncer::NIGORI))));
-
-  // Now do the actual configuration, which should download and apply bookmarks.
-  syncer::ModelTypeSet ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-  EXPECT_TRUE(ready_types.Equals(full_types));
-  EXPECT_TRUE(Intersection(fake_manager_->GetAndResetCleanedTypes(),
-                           enabled_types_).Empty());
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(
-      partial_types));
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetAndResetEnabledTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Empty());
-}
-
-// Test the behavior when we lose the sync db. Although we already have types
-// enabled, we should re-download all of them because we lost their data.
-TEST_F(SyncBackendHostTest, LostDB) {
-  sync_prefs_->SetSyncSetupCompleted();
-  // Initialization should fetch the Nigori node.  Everything else should be
-  // left untouched.
-  InitializeBackend(true);
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(
-      syncer::ModelTypeSet(syncer::ControlTypes())));
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(
-      syncer::ModelTypeSet(syncer::ControlTypes())));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Equals(
-          Difference(enabled_types_, syncer::ControlTypes())));
-
-  // The database was empty, so any cleaning is entirely optional.  We want to
-  // reset this value before running the next part of the test, though.
-  fake_manager_->GetAndResetCleanedTypes();
-
-  // The actual configuration should redownload and apply all the enabled types.
-  syncer::ModelTypeSet ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-  // Nigori is always downloaded so won't be ready.
-  EXPECT_TRUE(ready_types.Equals(syncer::Difference(
-      syncer::ControlTypes(),
-      syncer::ModelTypeSet(syncer::NIGORI))));
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().HasAll(
-      Difference(enabled_types_, syncer::ControlTypes())));
-  EXPECT_TRUE(Intersection(fake_manager_->GetAndResetCleanedTypes(),
-                           enabled_types_).Empty());
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetAndResetEnabledTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Empty());
-}
-
-TEST_F(SyncBackendHostTest, DisableTypes) {
-  // Simulate first time sync.
-  InitializeBackend(true);
-  fake_manager_->GetAndResetCleanedTypes();
-  syncer::ModelTypeSet ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-  // Nigori is always downloaded so won't be ready.
-  EXPECT_TRUE(ready_types.Equals(syncer::Difference(
-      syncer::ControlTypes(),
-      syncer::ModelTypeSet(syncer::NIGORI))));
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(
-      enabled_types_));
-  EXPECT_TRUE(Intersection(fake_manager_->GetAndResetCleanedTypes(),
-                           enabled_types_).Empty());
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Empty());
-
-  // Then disable two datatypes.
-  syncer::ModelTypeSet disabled_types(syncer::BOOKMARKS,
-                                      syncer::SEARCH_ENGINES);
-  syncer::ModelTypeSet old_types = enabled_types_;
-  enabled_types_.RemoveAll(disabled_types);
-  ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-
-  // Only those datatypes disabled should be cleaned. Nothing should be
-  // downloaded.
-  EXPECT_TRUE(ready_types.Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Empty());
-  EXPECT_TRUE(Intersection(fake_manager_->GetAndResetCleanedTypes(),
-                           old_types).Equals(disabled_types));
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetAndResetEnabledTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Empty());
-}
-
-TEST_F(SyncBackendHostTest, AddTypes) {
-  // Simulate first time sync.
-  InitializeBackend(true);
-  fake_manager_->GetAndResetCleanedTypes();
-  syncer::ModelTypeSet ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-  // Nigori is always downloaded so won't be ready.
-  EXPECT_TRUE(ready_types.Equals(syncer::Difference(
-      syncer::ControlTypes(),
-      syncer::ModelTypeSet(syncer::NIGORI))));
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(
-      enabled_types_));
-  EXPECT_TRUE(Intersection(fake_manager_->GetAndResetCleanedTypes(),
-                           enabled_types_).Empty());
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Empty());
-
-  // Then add two datatypes.
-  syncer::ModelTypeSet new_types(syncer::EXTENSIONS,
-                                 syncer::APPS);
-  enabled_types_.PutAll(new_types);
-  ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-
-  // Only those datatypes added should be downloaded (plus nigori). Nothing
-  // should be cleaned aside from the disabled types.
-  new_types.Put(syncer::NIGORI);
-  EXPECT_TRUE(
-      ready_types.Equals(syncer::Difference(enabled_types_, new_types)));
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(new_types));
-  EXPECT_TRUE(Intersection(fake_manager_->GetAndResetCleanedTypes(),
-                           enabled_types_).Empty());
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetAndResetEnabledTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Empty());
-}
-
-// And and disable in the same configuration.
-TEST_F(SyncBackendHostTest, AddDisableTypes) {
-  // Simulate first time sync.
-  InitializeBackend(true);
-  fake_manager_->GetAndResetCleanedTypes();
-  syncer::ModelTypeSet ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-  // Nigori is always downloaded so won't be ready.
-  EXPECT_TRUE(ready_types.Equals(syncer::Difference(
-      syncer::ControlTypes(),
-      syncer::ModelTypeSet(syncer::NIGORI))));
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(
-      enabled_types_));
-  EXPECT_TRUE(Intersection(fake_manager_->GetAndResetCleanedTypes(),
-                           enabled_types_).Empty());
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Empty());
-
-  // Then add two datatypes.
-  syncer::ModelTypeSet old_types = enabled_types_;
-  syncer::ModelTypeSet disabled_types(syncer::BOOKMARKS,
-                                      syncer::SEARCH_ENGINES);
-  syncer::ModelTypeSet new_types(syncer::EXTENSIONS,
-                                 syncer::APPS);
-  enabled_types_.PutAll(new_types);
-  enabled_types_.RemoveAll(disabled_types);
-  ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-
-  // Only those datatypes added should be downloaded (plus nigori). Nothing
-  // should be cleaned aside from the disabled types.
-  new_types.Put(syncer::NIGORI);
-  EXPECT_TRUE(
-      ready_types.Equals(syncer::Difference(enabled_types_, new_types)));
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(new_types));
-  EXPECT_TRUE(Intersection(fake_manager_->GetAndResetCleanedTypes(),
-                           old_types).Equals(disabled_types));
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetAndResetEnabledTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      old_types).Equals(disabled_types));
-}
-
-// Test restarting the browser to newly supported datatypes. The new datatypes
-// should be downloaded on the configuration after backend initialization.
-TEST_F(SyncBackendHostTest, NewlySupportedTypes) {
-  sync_prefs_->SetSyncSetupCompleted();
-  // Set sync manager behavior before passing it down. All types have progress
-  // markers and initial sync ended except the new types.
-  syncer::ModelTypeSet old_types = enabled_types_;
-  fake_manager_factory_->set_progress_marker_types(old_types);
-  fake_manager_factory_->set_initial_sync_ended_types(old_types);
-  syncer::ModelTypeSet new_types(syncer::APP_SETTINGS,
-                                 syncer::EXTENSION_SETTINGS);
-  enabled_types_.PutAll(new_types);
-
-  // Does nothing.
-  InitializeBackend(true);
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Empty());
-  EXPECT_TRUE(Intersection(fake_manager_->GetAndResetCleanedTypes(),
-                           old_types).Empty());
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(old_types));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Equals(new_types));
-
-  // Downloads and applies the new types (plus nigori).
-  syncer::ModelTypeSet ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-
-  new_types.Put(syncer::NIGORI);
-  EXPECT_TRUE(ready_types.Equals(
-      syncer::Difference(old_types, syncer::ModelTypeSet(syncer::NIGORI))));
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(new_types));
-  EXPECT_TRUE(Intersection(fake_manager_->GetAndResetCleanedTypes(),
-                           enabled_types_).Empty());
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetAndResetEnabledTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Empty());
-}
-
-// Test the newly supported types scenario, but with the presence of partial
-// types as well. Both partial and newly supported types should be downloaded
-// the configuration.
-TEST_F(SyncBackendHostTest, NewlySupportedTypesWithPartialTypes) {
-  sync_prefs_->SetSyncSetupCompleted();
-  // Set sync manager behavior before passing it down. All types have progress
-  // markers and initial sync ended except the new types.
-  syncer::ModelTypeSet old_types = enabled_types_;
-  syncer::ModelTypeSet partial_types(syncer::NIGORI, syncer::BOOKMARKS);
-  syncer::ModelTypeSet full_types =
-      Difference(enabled_types_, partial_types);
-  fake_manager_factory_->set_progress_marker_types(old_types);
-  fake_manager_factory_->set_initial_sync_ended_types(full_types);
-  syncer::ModelTypeSet new_types(syncer::APP_SETTINGS,
-                                 syncer::EXTENSION_SETTINGS);
-  enabled_types_.PutAll(new_types);
-
-  // Purge the partial types.  The nigori will be among the purged types, but
-  // the syncer will re-download it by the time the initialization is complete.
-  InitializeBackend(true);
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(
-      syncer::ModelTypeSet(syncer::NIGORI)));
-  EXPECT_TRUE(fake_manager_->GetAndResetCleanedTypes().HasAll(partial_types));
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(
-      syncer::Union(full_types, syncer::ModelTypeSet(syncer::NIGORI))));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Equals(Union(new_types, Difference(
-                      partial_types, syncer::ModelTypeSet(syncer::NIGORI)))));
-
-  // Downloads and applies the new types and partial types (which includes
-  // nigori anyways).
-  syncer::ModelTypeSet ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-  EXPECT_TRUE(ready_types.Equals(full_types));
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(
-      Union(new_types, partial_types)));
-  EXPECT_TRUE(Intersection(fake_manager_->GetAndResetCleanedTypes(),
-                           enabled_types_).Empty());
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetAndResetEnabledTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Empty());
-}
-
-// Verify that downloading control types only downloads those types that do
-// not have initial sync ended set.
-TEST_F(SyncBackendHostTest, DownloadControlTypes) {
-  sync_prefs_->SetSyncSetupCompleted();
-  // 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::NIGORI);
-  syncer::ModelTypeSet old_types =
-      Difference(enabled_types_, new_types);
-  fake_manager_factory_->set_progress_marker_types(old_types);
-  fake_manager_factory_->set_initial_sync_ended_types(old_types);
-
-  // Bringing up the backend should download the new types without downloading
-  // any old types.
-  InitializeBackend(true);
-  EXPECT_TRUE(fake_manager_->GetAndResetDownloadedTypes().Equals(new_types));
-  EXPECT_TRUE(fake_manager_->GetAndResetCleanedTypes().Equals(
-                  Difference(syncer::ModelTypeSet::All(),
-                             enabled_types_)));
-  EXPECT_TRUE(fake_manager_->InitialSyncEndedTypes().Equals(enabled_types_));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      enabled_types_).Empty());
-}
-
-// Fail to download control types.  It's believed that there is a server bug
-// which can allow this to happen (crbug.com/164288).  The sync backend host
-// should detect this condition and fail to initialize the backend.
-//
-// The failure is "silent" in the sense that the GetUpdates request appears to
-// be successful, but it returned no results.  This means that the usual
-// download retry logic will not be invoked.
-TEST_F(SyncBackendHostTest, SilentlyFailToDownloadControlTypes) {
-  fake_manager_factory_->set_configure_fail_types(syncer::ModelTypeSet::All());
-  InitializeBackend(false);
-}
-
-// Test that local refresh requests are delivered to sync.
-TEST_F(SyncBackendHostTest, ForwardLocalRefreshRequest) {
-  InitializeBackend(true);
-
-  syncer::ModelTypeSet set1 = syncer::ModelTypeSet::All();
-  backend_->TriggerRefresh(set1);
-  fake_manager_->WaitForSyncThread();
-  EXPECT_TRUE(set1.Equals(fake_manager_->GetLastRefreshRequestTypes()));
-
-  syncer::ModelTypeSet set2 = syncer::ModelTypeSet(syncer::SESSIONS);
-  backend_->TriggerRefresh(set2);
-  fake_manager_->WaitForSyncThread();
-  EXPECT_TRUE(set2.Equals(fake_manager_->GetLastRefreshRequestTypes()));
-}
-
-// Test that configuration on signin sends the proper GU source.
-TEST_F(SyncBackendHostTest, DownloadControlTypesNewClient) {
-  InitializeBackend(true);
-  EXPECT_EQ(syncer::CONFIGURE_REASON_NEW_CLIENT,
-            fake_manager_->GetAndResetConfigureReason());
-}
-
-// Test that configuration on restart sends the proper GU source.
-TEST_F(SyncBackendHostTest, DownloadControlTypesRestart) {
-  sync_prefs_->SetSyncSetupCompleted();
-  fake_manager_factory_->set_progress_marker_types(enabled_types_);
-  fake_manager_factory_->set_initial_sync_ended_types(enabled_types_);
-  InitializeBackend(true);
-  EXPECT_EQ(syncer::CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE,
-            fake_manager_->GetAndResetConfigureReason());
-}
-
-// It is SyncBackendHostCore responsibility to cleanup Sync Data folder if sync
-// setup hasn't been completed. This test ensures that cleanup happens.
-TEST_F(SyncBackendHostTest, TestStartupWithOldSyncData) {
-  const char* nonsense = "slon";
-  base::FilePath temp_directory =
-      profile_->GetPath().Append(base::FilePath(kTestSyncDir));
-  base::FilePath sync_file = temp_directory.AppendASCII("SyncData.sqlite3");
-  ASSERT_TRUE(base::CreateDirectory(temp_directory));
-  ASSERT_NE(-1, base::WriteFile(sync_file, nonsense, strlen(nonsense)));
-
-  InitializeBackend(true);
-
-  EXPECT_FALSE(base::PathExists(sync_file));
-}
-
-// If bookmarks encounter an error that results in disabling without purging
-// (such as when the type is unready), and then is explicitly disabled, the
-// SyncBackendHost needs to tell the manager to purge the type, even though
-// it's already disabled (crbug.com/386778).
-TEST_F(SyncBackendHostTest, DisableThenPurgeType) {
-  syncer::ModelTypeSet error_types(syncer::BOOKMARKS);
-
-  InitializeBackend(true);
-
-  // First enable the types.
-  syncer::ModelTypeSet ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-
-  // Nigori is always downloaded so won't be ready.
-  EXPECT_TRUE(ready_types.Equals(syncer::Difference(
-      syncer::ControlTypes(),
-      syncer::ModelTypeSet(syncer::NIGORI))));
-
-  // Then mark the error types as unready (disables without purging).
-  ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      error_types);
-  EXPECT_TRUE(
-      ready_types.Equals(syncer::Difference(enabled_types_, error_types)));
-  EXPECT_TRUE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      error_types).Empty());
-
-  // Lastly explicitly disable the error types, which should result in a purge.
-  enabled_types_.RemoveAll(error_types);
-  ready_types = ConfigureDataTypes(
-      enabled_types_, Difference(syncer::ModelTypeSet::All(), enabled_types_),
-      syncer::ModelTypeSet());
-  EXPECT_TRUE(
-      ready_types.Equals(syncer::Difference(enabled_types_, error_types)));
-  EXPECT_FALSE(fake_manager_->GetTypesWithEmptyProgressMarkerToken(
-      error_types).Empty());
-}
-
-// Test that a call to ClearServerData is forwarded to the underlying
-// SyncManager.
-TEST_F(SyncBackendHostTest, ClearServerDataCallsAreForwarded) {
-  InitializeBackend(true);
-  syncer::CallbackCounter callback_counter;
-  backend_->ClearServerData(base::Bind(&syncer::CallbackCounter::Callback,
-                                       base::Unretained(&callback_counter)));
-  fake_manager_->WaitForSyncThread();
-  EXPECT_EQ(1, callback_counter.times_called());
-}
-
-// Ensure that redundant invalidations are ignored and that the most recent
-// set of invalidation version is persisted across restarts.
-TEST_F(SyncBackendHostTest, IgnoreOldInvalidations) {
-  // Set up some old persisted invalidations.
-  std::map<syncer::ModelType, int64> invalidation_versions;
-  invalidation_versions[syncer::BOOKMARKS] = 20;
-  sync_prefs_->UpdateInvalidationVersions(invalidation_versions);
-  InitializeBackend(true);
-  EXPECT_EQ(0, fake_manager_->GetInvalidationCount());
-
-  // Receiving an invalidation with an old version should do nothing.
-  syncer::ObjectIdInvalidationMap invalidation_map;
-  std::string notification_type;
-  syncer::RealModelTypeToNotificationType(syncer::BOOKMARKS,
-                                          &notification_type);
-  invalidation_map.Insert(syncer::Invalidation::Init(
-      invalidation::ObjectId(0, notification_type), 10, "payload"));
-  backend_->OnIncomingInvalidation(invalidation_map);
-  fake_manager_->WaitForSyncThread();
-  EXPECT_EQ(0, fake_manager_->GetInvalidationCount());
-
-  // Invalidations with new versions should be acted upon.
-  invalidation_map.Insert(syncer::Invalidation::Init(
-      invalidation::ObjectId(0, notification_type), 30, "payload"));
-  backend_->OnIncomingInvalidation(invalidation_map);
-  fake_manager_->WaitForSyncThread();
-  EXPECT_EQ(1, fake_manager_->GetInvalidationCount());
-
-  // Invalidation for new data types should be acted on.
-  syncer::RealModelTypeToNotificationType(syncer::SESSIONS, &notification_type);
-  invalidation_map.Insert(syncer::Invalidation::Init(
-      invalidation::ObjectId(0, notification_type), 10, "payload"));
-  backend_->OnIncomingInvalidation(invalidation_map);
-  fake_manager_->WaitForSyncThread();
-  EXPECT_EQ(2, fake_manager_->GetInvalidationCount());
-
-  // But redelivering that same invalidation should be ignored.
-  backend_->OnIncomingInvalidation(invalidation_map);
-  fake_manager_->WaitForSyncThread();
-  EXPECT_EQ(2, fake_manager_->GetInvalidationCount());
-
-  // If an invalidation with an unknown version is received, it should be
-  // acted on, but should not affect the persisted versions.
-  invalidation_map.Insert(syncer::Invalidation::InitUnknownVersion(
-      invalidation::ObjectId(0, notification_type)));
-  backend_->OnIncomingInvalidation(invalidation_map);
-  fake_manager_->WaitForSyncThread();
-  EXPECT_EQ(3, fake_manager_->GetInvalidationCount());
-
-  // Verify that the invalidation versions were updated in the prefs.
-  invalidation_versions[syncer::BOOKMARKS] = 30;
-  invalidation_versions[syncer::SESSIONS] = 10;
-  std::map<syncer::ModelType, int64> persisted_invalidation_versions;
-  sync_prefs_->GetInvalidationVersions(&persisted_invalidation_versions);
-  EXPECT_EQ(invalidation_versions.size(),
-            persisted_invalidation_versions.size());
-  for (auto iter : persisted_invalidation_versions) {
-    EXPECT_EQ(invalidation_versions[iter.first], iter.second);
-  }
-}
-
-}  // namespace
-
-}  // namespace browser_sync