[Sync] Introduce ModelError for USS error handling.

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

 // Copyright 2016 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 "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/sync/chrome_sync_client.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
@@ skipping 45 matching lines @@
 // A FakeModelTypeSyncBridge that supports observing ApplySyncChanges.
 class TestModelTypeSyncBridge : public FakeModelTypeSyncBridge {
  public:
   class Observer {
    public:
     virtual void OnApplySyncChanges() = 0;
   };
 
   TestModelTypeSyncBridge()
       : FakeModelTypeSyncBridge(base::Bind(&ModelTypeChangeProcessor::Create)) {
-    change_processor()->OnMetadataLoaded(syncer::SyncError(),
-                                         db().CreateMetadataBatch());
+    change_processor()->OnMetadataLoaded(db().CreateMetadataBatch());
   }
 
-  syncer::SyncError ApplySyncChanges(
+  syncer::ModelError ApplySyncChanges(
       std::unique_ptr<syncer::MetadataChangeList> metadata_changes,
       syncer::EntityChangeList entity_changes) override {
-    syncer::SyncError error = FakeModelTypeSyncBridge::ApplySyncChanges(
+    syncer::ModelError error = FakeModelTypeSyncBridge::ApplySyncChanges(

[skym, 2017/01/09 18:20:27]

Seems like there should be an #include .../model_error.h in this file. Can you
audit these changes to make sure you didn't miss any others?

[maxbogue, 2017/01/09 21:29:33]

Done.

         std::move(metadata_changes), entity_changes);
     NotifyObservers();
     return error;
   }
 
   void AddObserver(Observer* observer) { observers_.insert(observer); }
   void RemoveObserver(Observer* observer) { observers_.erase(observer); }
 
  private:
   void NotifyObservers() {
@@ skipping 233 matching lines @@
 IN_PROC_BROWSER_TEST_F(TwoClientUssSyncTest, Error) {
   ASSERT_TRUE(SetupSync());
   TestModelTypeSyncBridge* model0 = GetModelTypeSyncBridge(0);
   TestModelTypeSyncBridge* model1 = GetModelTypeSyncBridge(1);
 
   // Add an entity.
   model0->WriteItem(kKey1, kValue1);
   ASSERT_TRUE(DataChecker(model1, kKey1, kValue1).Wait());
 
   // Set an error in model 1 to trigger in the next GetUpdates.
-  model1->ErrorOnNextCall(syncer::SyncError::DATATYPE_ERROR);
+  model1->ErrorOnNextCall();
   // Write an item on model 0 to trigger a GetUpdates in model 1.
   model0->WriteItem(kKey1, kValue2);
 
   // The type should stop syncing but keep tracking metadata.
   ASSERT_TRUE(PrefsNotRunningChecker(GetSyncService(1)).Wait());
   ASSERT_EQ(1U, model1->db().metadata_count());
   model1->WriteItem(kKey2, kValue2);
   ASSERT_EQ(2U, model1->db().metadata_count());
 }
 
@@ skipping 23 matching lines @@
 
   ASSERT_TRUE(DataChecker(model1, kKey1, kValue2).Wait());
   ASSERT_TRUE(DataChecker(model1, kKey2, kValue1).Wait());
   ASSERT_TRUE(DataChecker(model1, kKey4, kValue1).Wait());
 
   ASSERT_TRUE(DataChecker(model0, kKey1, kValue2).Wait());
   ASSERT_TRUE(DataChecker(model0, kKey3, kValue1).Wait());
 }
 
 }  // namespace