[Sync] Introduce ModelError for USS error handling.

components/sync/model_impl/model_type_store_impl_unittest.cc

Index: components/sync/model_impl/model_type_store_impl_unittest.cc
diff --git a/components/sync/model_impl/model_type_store_impl_unittest.cc b/components/sync/model_impl/model_type_store_impl_unittest.cc
index ab709dd18190182b3e2fd1eed75b2e249cab25f8..e8d6b766ae7dfa30661529db8b5e6da6352cc60f 100644
--- a/components/sync/model_impl/model_type_store_impl_unittest.cc
+++ b/components/sync/model_impl/model_type_store_impl_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "components/sync/model/model_error.h"
 #include "components/sync/protocol/entity_metadata.pb.h"
 #include "components/sync/protocol/model_type_state.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -143,11 +144,11 @@ class ModelTypeStoreImplTest : public testing::Test {
         base::Bind(&CaptureResultAndRecords, &result, data_records));
     PumpLoop();
     ASSERT_EQ(ModelTypeStore::Result::SUCCESS, result);
-    SyncError sync_error;
-    store->ReadAllMetadata(base::Bind(&CaptureSyncErrorAndMetadataBatch,
-                                      &sync_error, metadata_batch));
+    ModelError error;
+    store->ReadAllMetadata(
+        base::Bind(&CaptureErrorAndMetadataBatch, &error, metadata_batch));
     PumpLoop();
-    ASSERT_FALSE(sync_error.IsSet());
+    ASSERT_FALSE(error.IsSet());
   }
 
   // Following functions capture parameters passed to callbacks into variables
@@ -167,12 +168,12 @@ class ModelTypeStoreImplTest : public testing::Test {
     *dst_records = std::move(records);
   }
 
-  static void CaptureSyncErrorAndMetadataBatch(
-      SyncError* dst_sync_error,
+  static void CaptureErrorAndMetadataBatch(
+      ModelError* dst_error,
       std::unique_ptr<MetadataBatch>* dst_batch,
-      SyncError sync_error,
+      ModelError error,
       std::unique_ptr<MetadataBatch> batch) {
-    *dst_sync_error = sync_error;
+    *dst_error = error;
     *dst_batch = std::move(batch);
   }
 
@@ -267,10 +268,10 @@ TEST_F(ModelTypeStoreImplTest, MissingModelTypeState) {
   PumpLoop();
   ASSERT_EQ(ModelTypeStore::Result::SUCCESS, result);
 
-  SyncError error;
+  ModelError error;
   std::unique_ptr<MetadataBatch> metadata_batch;
   store()->ReadAllMetadata(
-      base::Bind(&CaptureSyncErrorAndMetadataBatch, &error, &metadata_batch));
+      base::Bind(&CaptureErrorAndMetadataBatch, &error, &metadata_batch));
   PumpLoop();
   ASSERT_FALSE(error.IsSet());
   VerifyMetadata(std::move(metadata_batch), sync_pb::ModelTypeState(),
@@ -285,10 +286,10 @@ TEST_F(ModelTypeStoreImplTest, CorruptModelTypeState) {
   // Write a ModelTypeState that can't be parsed.
   WriteRawModelTypeState(store(), "unparseable");
 
-  SyncError error;
+  ModelError error;
   std::unique_ptr<MetadataBatch> metadata_batch;
   store()->ReadAllMetadata(
-      base::Bind(&CaptureSyncErrorAndMetadataBatch, &error, &metadata_batch));
+      base::Bind(&CaptureErrorAndMetadataBatch, &error, &metadata_batch));
   PumpLoop();
   ASSERT_TRUE(error.IsSet());
   VerifyMetadata(std::move(metadata_batch), sync_pb::ModelTypeState(),
@@ -303,10 +304,10 @@ TEST_F(ModelTypeStoreImplTest, CorruptEntityMetadata) {
   // Write an EntityMetadata that can't be parsed.
   WriteRawMetadata(store(), "id", "unparseable");
 
-  SyncError error;
+  ModelError error;
   std::unique_ptr<MetadataBatch> metadata_batch;
   store()->ReadAllMetadata(
-      base::Bind(&CaptureSyncErrorAndMetadataBatch, &error, &metadata_batch));
+      base::Bind(&CaptureErrorAndMetadataBatch, &error, &metadata_batch));
   PumpLoop();
   ASSERT_TRUE(error.IsSet());
   VerifyMetadata(std::move(metadata_batch), sync_pb::ModelTypeState(),