[Sync] Handle errors during first sync gracefully.

chrome/browser/sync/glue/data_type_manager_impl.cc

Index: chrome/browser/sync/glue/data_type_manager_impl.cc
diff --git a/chrome/browser/sync/glue/data_type_manager_impl.cc b/chrome/browser/sync/glue/data_type_manager_impl.cc
index a26d3077e4a9d23b5ea4ac04282f418a5a913789..d33568fee4ff7d66f1e831e17e6e41fc4a282aef 100644
--- a/chrome/browser/sync/glue/data_type_manager_impl.cc
+++ b/chrome/browser/sync/glue/data_type_manager_impl.cc
@@ -235,6 +235,8 @@ void DataTypeManagerImpl::Restart(sync_api::ConfigureReason reason,
       reason,
       base::Bind(&DataTypeManagerImpl::DownloadReady,
                  weak_ptr_factory_.GetWeakPtr()),
+      base::Bind(&DataTypeManagerImpl::OnDownloadRetry,
+                 weak_ptr_factory_.GetWeakPtr()),
       enable_nigori);
 }
 
@@ -268,6 +270,18 @@ bool DataTypeManagerImpl::ProcessReconfigure() {
   return true;
 }
 
+void DataTypeManagerImpl::OnDownloadRetry() {
+  DCHECK_EQ(state_, DOWNLOAD_PENDING);
+
+  // Inform the listeners we are waiting.
+  ConfigureResult result;
+  result.status = DataTypeManager::RETRY;
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,

[Andrew T Wilson (Slow), 2012/01/27 00:19:03]

See my previous comment - perhaps there's a better way to notify observers of
this state rather than via CONFIGURE_DONE.

[lipalani1, 2012/01/27 02:54:29]

Answered above.
On 2012/01/27 00:19:03, Andrew T Wilson wrote:

+      content::Source<DataTypeManager>(this),
+      content::Details<const ConfigureResult>(&result));
+}
+
 void DataTypeManagerImpl::DownloadReady(
     syncable::ModelTypeSet failed_configuration_types) {
   DCHECK_EQ(state_, DOWNLOAD_PENDING);