Fix the false-positive detection of commit errors

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 17cf14a13613916b9721fc226781e4b48ea38f80..c928b7ed60b2cf06732f64632c3807ca2b0530d1 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -70,7 +70,7 @@ using browser_sync::JsEventDetails;
 using browser_sync::JsEventHandler;
 using browser_sync::SyncBackendHost;
 using browser_sync::WeakHandle;
-using browser_sync::SyncProtocolError;
+using browser_sync::SyncOperationResult;
 using sync_api::SyncCredentials;
 
 typedef GoogleServiceAuthError AuthError;
@@ -85,7 +85,7 @@ static const int kSyncClearDataTimeoutInSeconds = 60;  // 1 minute.
 
 
 bool ShouldShowActionOnUI(
-    const browser_sync::SyncProtocolError& error) {
+    const browser_sync::SyncOperationResult& error) {
   return (error.action != browser_sync::UNKNOWN_ACTION &&
           error.action != browser_sync::DISABLE_SYNC_ON_CLIENT);
 }
@@ -566,7 +566,7 @@ void ProfileSyncService::ClearStaleErrors() {
   unrecoverable_error_detected_ = false;
   unrecoverable_error_message_.clear();
   unrecoverable_error_location_ = tracked_objects::Location();
-  last_actionable_error_ = SyncProtocolError();
+  last_actionable_error_ = SyncOperationResult();
 }
 
 // static
@@ -956,7 +956,7 @@ void ProfileSyncService::OnMigrationNeededForTypes(
   migrator_->MigrateTypes(types);
 }
 
-void ProfileSyncService::OnActionableError(const SyncProtocolError& error) {
+void ProfileSyncService::OnActionableError(const SyncOperationResult& error) {
   last_actionable_error_ = error;
   DCHECK_NE(last_actionable_error_.action,
             browser_sync::UNKNOWN_ACTION);