[Sync] Fail softly in SMTP if an error occurs during startup.

components/sync/model_impl/shared_model_type_processor_unittest.cc

Index: components/sync/model_impl/shared_model_type_processor_unittest.cc
diff --git a/components/sync/model_impl/shared_model_type_processor_unittest.cc b/components/sync/model_impl/shared_model_type_processor_unittest.cc
index 73dc7b1fef64fd96276779b3703b35edbaec10e7..ed58b826f831838e6ecab42a6e642abe1fe6316e 100644
--- a/components/sync/model_impl/shared_model_type_processor_unittest.cc
+++ b/components/sync/model_impl/shared_model_type_processor_unittest.cc
@@ -324,7 +324,7 @@ TEST_F(SharedModelTypeProcessorTest, NonInitialSync) {
 }
 
 // Test that an error during the merge is propagated to the error handler.
-TEST_F(SharedModelTypeProcessorTest, InitialError) {
+TEST_F(SharedModelTypeProcessorTest, MergeError) {
   OnMetadataLoaded();
   OnSyncStarting();
 
@@ -351,6 +351,21 @@ TEST_F(SharedModelTypeProcessorTest, StartErrors) {
   InitializeToMetadataLoaded();
   ExpectError();
   OnSyncStarting();
+
+  // Test an error prior to metadata load.
+  ResetState(false);
+  type_processor()->ReportError(FROM_HERE, "boom");
+  ExpectError();
+  OnSyncStarting();
+  OnMetadataLoaded();
+
+  // Test an error prior to pending data load.
+  ResetStateWriteItem(kKey1, kValue1);
+  InitializeToMetadataLoaded();
+  type_processor()->ReportError(FROM_HERE, "boom");
+  ExpectError();
+  OnSyncStarting();
+  OnPendingCommitDataLoaded();
 }
 
 // This test covers race conditions during loading pending data. All cases