Fix the false-positive detection of commit errors

chrome/browser/sync/sessions/status_controller.cc

 // 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.
 
 #include "chrome/browser/sync/sessions/status_controller.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "chrome/browser/sync/protocol/sync_protocol_error.h"
@@ skipping 136 matching lines @@
 
 void StatusController::increment_num_local_overwrites() {
   shared_.syncer_status.mutate()->num_local_overwrites++;
 }
 
 void StatusController::increment_num_server_overwrites() {
   shared_.syncer_status.mutate()->num_server_overwrites++;
 }
 
 void StatusController::set_sync_protocol_error(
-    const SyncProtocolError& error) {
+    const SyncOperationResult& error) {
   shared_.error.mutate()->sync_protocol_error = error;
 }
 
 void StatusController::set_commit_set(const OrderedCommitSet& commit_set) {
   DCHECK(!group_restriction_in_effect_);
   shared_.commit_set = commit_set;
 }
 
 void StatusController::update_conflict_sets_built(bool built) {
   shared_.control_params.conflict_sets_built |= built;
@@ skipping 69 matching lines @@
     NOTREACHED();  // Server should always send changes remaining.
     return false;  // Avoid looping forever.
   }
   // Changes remaining is an estimate, but if it's estimated to be
   // zero, that's firm and we don't have to ask again.
   return updates_response().get_updates().changes_remaining() == 0;
 }
 
 }  // namespace sessions
 }  // namespace browser_sync