[Sync] Calculate active types and track catch up in DTMI not PSS.

components/browser_sync/profile_sync_service_unittest.cc

 // Copyright (c) 2012 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/browser_sync/profile_sync_service.h"
 
 #include <utility>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 23 matching lines @@
 #include "components/sync/engine/fake_sync_engine.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "components/version_info/version_info_values.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using syncer::DataTypeController;
 using syncer::FakeSyncEngine;
+using syncer::ModelTypeSet;
 using syncer::SyncMergeResult;
 using testing::Return;
 
 namespace browser_sync {
 
 namespace {
 
 const char kGaiaId[] = "12345";
 const char kEmail[] = "test_user@gmail.com";
 
@@ skipping 10 matching lines @@
                  syncer::ConfigureReason reason) override {
     DCHECK(!configure_called_.is_null());
     configure_called_.Run(reason);
   }
 
   void ReenableType(syncer::ModelType type) override {}
   void ResetDataTypeErrors() override {}
   void PurgeForMigration(syncer::ModelTypeSet undesired_types,
                          syncer::ConfigureReason reason) override {}
   void Stop() override{};
-  State state() const override { return syncer::DataTypeManager::CONFIGURED; };
+  ModelTypeSet GetActiveDataTypes() const override { return ModelTypeSet(); }
+  State state() const override { return syncer::DataTypeManager::CONFIGURED; }
 
  private:
   ConfigureCalled configure_called_;
 };
 
 ACTION_P(ReturnNewDataTypeManager, configure_called) {
   return new FakeDataTypeManager(configure_called);
 }
 
 using testing::Return;
@@ skipping 167 matching lines @@
                                    sync_pb::EncryptedData());
   }
 
   void TriggerDataTypeStartRequest() {
     service_->OnDataTypeRequestsSyncStartup(syncer::BOOKMARKS);
   }
 
   void OnConfigureCalled(syncer::ConfigureReason configure_reason) {
     syncer::DataTypeManager::ConfigureResult result;
     result.status = syncer::DataTypeManager::OK;
+    if (configure_reason == syncer::CONFIGURE_REASON_CATCH_UP)
+      result.was_catch_up_configure = true;
     service()->OnConfigureDone(result);
   }
 
   FakeDataTypeManager::ConfigureCalled GetDefaultConfigureCalledCallback() {
     return base::Bind(&ProfileSyncServiceTest::OnConfigureCalled,
                       base::Unretained(this));
   }
 
   void OnConfigureCalledRecordReason(syncer::ConfigureReason* reason_dest,
                                      syncer::ConfigureReason reason) {
@@ skipping 455 matching lines @@
 
   // Simulate user entering encryption passphrase. Ensure that catch up
   // configure cycle is started (DTM::Configure is called with
   // CONFIGURE_REASON_CATCH_UP).
   const syncer::SyncEncryptionHandler::NigoriState nigori_state;
   service()->OnLocalSetPassphraseEncryption(nigori_state);
   EXPECT_EQ(syncer::CONFIGURE_REASON_CATCH_UP, configure_reason);
   EXPECT_TRUE(captured_callback.is_null());
 
   // Simulate configure successful. Ensure that SBH::ClearServerData is called.
+  result.was_catch_up_configure = true;
   service()->OnConfigureDone(result);
+  result.was_catch_up_configure = false;
   EXPECT_FALSE(captured_callback.is_null());
 
   // Once SBH::ClearServerData finishes successfully ensure that sync is
   // restarted.
   configure_reason = syncer::CONFIGURE_REASON_UNKNOWN;
   ExpectSyncEngineCreation(1);
   ExpectDataTypeManagerCreation(
       1, GetRecordingConfigureCalledCallback(&configure_reason));
   captured_callback.Run();
   testing::Mock::VerifyAndClearExpectations(component_factory());
@@ skipping 38 matching lines @@
   EXPECT_EQ(syncer::CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE, configure_reason);
   EXPECT_TRUE(captured_callback.is_null());
 
   // Simulate configure successful. This time it should be catch up.
   service()->OnConfigureDone(result);
   EXPECT_EQ(syncer::CONFIGURE_REASON_CATCH_UP, configure_reason);
   EXPECT_TRUE(captured_callback.is_null());
 
   // Simulate catch up configure successful. Ensure that SBH::ClearServerData is
   // called.
+  result.was_catch_up_configure = true;
   service()->OnConfigureDone(result);
+  result.was_catch_up_configure = false;
   EXPECT_FALSE(captured_callback.is_null());
 
   ExpectSyncEngineCreation(1);
   ExpectDataTypeManagerCreation(
       1, GetRecordingConfigureCalledCallback(&configure_reason));
   captured_callback.Run();
   testing::Mock::VerifyAndClearExpectations(component_factory());
   EXPECT_EQ(syncer::CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE, configure_reason);
 }
 
@@ skipping 31 matching lines @@
 
   // Simulate configure successful. This time it should be catch up.
   syncer::DataTypeManager::ConfigureResult result;
   result.status = syncer::DataTypeManager::OK;
   service()->OnConfigureDone(result);
   EXPECT_EQ(syncer::CONFIGURE_REASON_CATCH_UP, configure_reason);
   EXPECT_TRUE(captured_callback.is_null());
 
   // Simulate catch up configure successful. Ensure that SBH::ClearServerData is
   // called.
+  result.was_catch_up_configure = true;
   service()->OnConfigureDone(result);
+  result.was_catch_up_configure = false;
   EXPECT_FALSE(captured_callback.is_null());
 
   ExpectSyncEngineCreation(1);
   ExpectDataTypeManagerCreation(
       1, GetRecordingConfigureCalledCallback(&configure_reason));
   captured_callback.Run();
   testing::Mock::VerifyAndClearExpectations(component_factory());
   EXPECT_EQ(syncer::CONFIGURE_REASON_NEWLY_ENABLED_DATA_TYPE, configure_reason);
 }
 
@@ skipping 96 matching lines @@
   // Progress the controller to RUNNING first, which is how the service
   // determines whether a type is enabled.
   controller->StartAssociating(base::Bind(&DoNothing));
   controller->FinishStart(DataTypeController::OK_FIRST_RUN);
   service()->RegisterDataTypeController(std::move(controller));
   EXPECT_NE(nullptr, service()->GetOpenTabsUIDelegate());
 }
 
 }  // namespace
 }  // namespace browser_sync