Fix the false-positive detection of commit errors

chrome/browser/sync/internal_api/sync_manager.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SYNC_INTERNAL_API_SYNC_MANAGER_H_
 #define CHROME_BROWSER_SYNC_INTERNAL_API_SYNC_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 111 matching lines @@
                              // issues.
     bool notifications_enabled;  // True only if subscribed for notifications.
 
     // Notifications counters updated by the actions in synapi.
     int notifications_received;
     int notifiable_commits;
 
     // The max number of consecutive errors from any component.
     int max_consecutive_errors;
 
-    browser_sync::SyncProtocolError sync_protocol_error;
+    // FIXME: is this used anywhere????
+    browser_sync::SyncOperationResult sync_protocol_error;
 
     int unsynced_count;
 
     int conflicting_count;
     bool syncing;
     // True after a client has done a first sync.
     bool initial_sync_ended;
     // True if any syncer is stuck.
     bool syncer_stuck;
 
@@ skipping 231 matching lines @@
     // After a request to clear server data, these callbacks are invoked to
     // indicate success or failure.
     virtual void OnClearServerDataSucceeded() = 0;
     virtual void OnClearServerDataFailed() = 0;
 
     // Called after we finish encrypting all appropriate datatypes.
     virtual void OnEncryptionComplete(
         const syncable::ModelTypeSet& encrypted_types) = 0;
 
     virtual void OnActionableError(
-        const browser_sync::SyncProtocolError& sync_protocol_error) = 0;
+        const browser_sync::SyncOperationResult& sync_operation_result) = 0;
 
    protected:
     virtual ~Observer();
   };
 
   // Create an uninitialized SyncManager.  Callers must Init() before using.
   explicit SyncManager(const std::string& name);
   virtual ~SyncManager();
 
   // Initialize the sync manager.  |database_location| specifies the path of
@@ skipping 163 matching lines @@
 };
 
 bool InitialSyncEndedForTypes(syncable::ModelTypeSet types, UserShare* share);
 
 // Returns the string representation of a PassphraseRequiredReason value.
 std::string PassphraseRequiredReasonToString(PassphraseRequiredReason reason);
 
 } // namespace sync_api
 
 #endif  // CHROME_BROWSER_SYNC_INTERNAL_API_SYNC_MANAGER_H_