[Sync] Services can now always assume processor exists.

chrome/browser/sync/test/integration/two_client_uss_sync_test.cc

Index: chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc b/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
index 860ab24b201552fe8fd4407efe88664ce4dcef82..b0227d8478af325a1cff67a9441be36b362ca306 100644
--- a/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_uss_sync_test.cc
@@ -56,7 +56,10 @@ class TestModelTypeService : public FakeModelTypeService {
 
   TestModelTypeService()
       : FakeModelTypeService(
-            base::Bind(&SharedModelTypeProcessor::CreateAsChangeProcessor)) {}
+            base::Bind(&SharedModelTypeProcessor::CreateAsChangeProcessor)) {
+    change_processor()->OnMetadataLoaded(syncer::SyncError(),
+                                         db()->CreateMetadataBatch());
+  }
 
   syncer::SyncError ApplySyncChanges(
       std::unique_ptr<syncer::MetadataChangeList> metadata_changes,
@@ -67,11 +70,6 @@ class TestModelTypeService : public FakeModelTypeService {
     return error;
   }
 
-  void OnChangeProcessorSet() override {
-    change_processor()->OnMetadataLoaded(syncer::SyncError(),
-                                         db().CreateMetadataBatch());
-  }
-
   void AddObserver(Observer* observer) { observers_.insert(observer); }
   void RemoveObserver(Observer* observer) { observers_.erase(observer); }
 
@@ -113,7 +111,7 @@ class DataChecker : public KeyChecker {
       : KeyChecker(service, key), value_(value) {}
 
   bool IsExitConditionSatisfied() override {
-    const auto& db = service_->db();
+    const auto& db = *service_->db();
     return db.HasData(key_) && db.GetValue(key_) == value_;
   }
 
@@ -132,7 +130,7 @@ class DataAbsentChecker : public KeyChecker {
       : KeyChecker(service, key) {}
 
   bool IsExitConditionSatisfied() override {
-    return !service_->db().HasData(key_);
+    return !service_->db()->HasData(key_);
   }
 
   std::string GetDebugMessage() const override {
@@ -147,7 +145,7 @@ class MetadataPresentChecker : public KeyChecker {
       : KeyChecker(service, key) {}
 
   bool IsExitConditionSatisfied() override {
-    return service_->db().HasMetadata(key_);
+    return service_->db()->HasMetadata(key_);
   }
 
   std::string GetDebugMessage() const override {
@@ -162,7 +160,7 @@ class MetadataAbsentChecker : public KeyChecker {
       : KeyChecker(service, key) {}
 
   bool IsExitConditionSatisfied() override {
-    return !service_->db().HasMetadata(key_);
+    return !service_->db()->HasMetadata(key_);
   }
 
   std::string GetDebugMessage() const override {
@@ -258,10 +256,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientUssSyncTest, DisableEnable) {
   // Add an entity to test with.
   model1->WriteItem(kKey1, kValue1);
   ASSERT_TRUE(DataChecker(model2, kKey1, kValue1).Wait());
-  ASSERT_EQ(1U, model1->db().data_count());
-  ASSERT_EQ(1U, model1->db().metadata_count());
-  ASSERT_EQ(1U, model2->db().data_count());
-  ASSERT_EQ(1U, model2->db().metadata_count());
+  ASSERT_EQ(1U, model1->db()->data_count());
+  ASSERT_EQ(1U, model1->db()->metadata_count());
+  ASSERT_EQ(1U, model2->db()->data_count());
+  ASSERT_EQ(1U, model2->db()->metadata_count());
 
   // Disable PREFERENCES.
   syncer::ModelTypeSet types = syncer::UserSelectableTypes();
@@ -270,21 +268,21 @@ IN_PROC_BROWSER_TEST_F(TwoClientUssSyncTest, DisableEnable) {
 
   // Wait for it to take effect and remove the metadata.
   ASSERT_TRUE(MetadataAbsentChecker(model1, kKey1).Wait());
-  ASSERT_EQ(1U, model1->db().data_count());
-  ASSERT_EQ(0U, model1->db().metadata_count());
+  ASSERT_EQ(1U, model1->db()->data_count());
+  ASSERT_EQ(0U, model1->db()->metadata_count());
   // Model 2 should not be affected.
-  ASSERT_EQ(1U, model2->db().data_count());
-  ASSERT_EQ(1U, model2->db().metadata_count());
+  ASSERT_EQ(1U, model2->db()->data_count());
+  ASSERT_EQ(1U, model2->db()->metadata_count());
 
   // Re-enable PREFERENCES.
   GetSyncService(0)->OnUserChoseDatatypes(true, syncer::UserSelectableTypes());
 
   // Wait for metadata to be re-added.
   ASSERT_TRUE(MetadataPresentChecker(model1, kKey1).Wait());
-  ASSERT_EQ(1U, model1->db().data_count());
-  ASSERT_EQ(1U, model1->db().metadata_count());
-  ASSERT_EQ(1U, model2->db().data_count());
-  ASSERT_EQ(1U, model2->db().metadata_count());
+  ASSERT_EQ(1U, model1->db()->data_count());
+  ASSERT_EQ(1U, model1->db()->metadata_count());
+  ASSERT_EQ(1U, model2->db()->data_count());
+  ASSERT_EQ(1U, model2->db()->metadata_count());
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientUssSyncTest, ConflictResolution) {
@@ -322,7 +320,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientUssSyncTest, Error) {
 
   // The type should stop syncing but keep tracking metadata.
   ASSERT_TRUE(PrefsNotRunningChecker(GetSyncService(1)).Wait());
-  ASSERT_EQ(1U, model2->db().metadata_count());
+  ASSERT_EQ(1U, model2->db()->metadata_count());
   model2->WriteItem(kKey2, kValue2);
-  ASSERT_EQ(2U, model2->db().metadata_count());
+  ASSERT_EQ(2U, model2->db()->metadata_count());
 }