Remove broken variables from sync's AllStatus

chrome/browser/sync/engine/all_status.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/engine/all_status.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/port.h"
@@ skipping 17 matching lines @@
 }
 
 sync_api::SyncManager::Status AllStatus::CreateBlankStatus() const {
   // Status is initialized with the previous status value.  Variables
   // whose values accumulate (e.g. lifetime counters like updates_received)
   // are not to be cleared here.
   sync_api::SyncManager::Status status = status_;
   status.unsynced_count = 0;
   status.conflicting_count = 0;
   status.initial_sync_ended = false;
-  status.syncer_stuck = false;
   status.max_consecutive_errors = 0;
-  status.server_broken = false;
   status.updates_available = 0;
   return status;
 }
 
 sync_api::SyncManager::Status AllStatus::CalcSyncing(
     const SyncEngineEvent &event) const {
   sync_api::SyncManager::Status status = CreateBlankStatus();
   const sessions::SyncSessionSnapshot* snapshot = event.snapshot;
   status.unsynced_count += static_cast<int>(snapshot->unsynced_count);
   status.conflicting_count += snapshot->errors.num_conflicting_commits;
   // The syncer may not be done yet, which could cause conflicting updates.
   // But this is only used for status, so it is better to have visibility.
   status.conflicting_count += snapshot->num_conflicting_updates;
 
   if (event.what_happened == SyncEngineEvent::SYNC_CYCLE_BEGIN) {
     status.syncing = true;
   } else if (event.what_happened == SyncEngineEvent::SYNC_CYCLE_ENDED) {
     status.syncing = false;
   }
 
   status.initial_sync_ended |= snapshot->is_share_usable;
-  status.syncer_stuck |= snapshot->syncer_status.syncer_stuck;
 
   const sessions::ErrorCounters& errors(snapshot->errors);
   if (errors.consecutive_errors > status.max_consecutive_errors)
     status.max_consecutive_errors = errors.consecutive_errors;
 
-  // 100 is an arbitrary limit.
-  if (errors.consecutive_transient_error_commits > 100)
-    status.server_broken = true;
-
   status.updates_available += snapshot->num_server_changes_remaining;
-
   status.sync_protocol_error = snapshot->errors.sync_protocol_error;
 
   // Accumulate update count only once per session to avoid double-counting.
   // TODO(ncarter): Make this realtime by having the syncer_status
   // counter preserve its value across sessions.  http://crbug.com/26339
   if (event.what_happened == SyncEngineEvent::SYNC_CYCLE_ENDED) {
     status.updates_received +=
         snapshot->syncer_status.num_updates_downloaded_total;
     status.tombstone_updates_received +=
         snapshot->syncer_status.num_tombstone_updates_downloaded_total;
@@ skipping 12 matching lines @@
     } else {
       ++status.useful_sync_cycles;
     }
   }
   return status;
 }
 
 void AllStatus::CalcStatusChanges() {
   const bool unsynced_changes = status_.unsynced_count > 0;
   const bool online = status_.authenticated &&
-    status_.server_reachable && status_.server_up && !status_.server_broken;
+    status_.server_reachable && status_.server_up;
   if (online) {
-    if (status_.syncer_stuck)
-      status_.summary = sync_api::SyncManager::Status::CONFLICT;
-    else if (status_.syncing)
+    if (status_.syncing)
       status_.summary = sync_api::SyncManager::Status::SYNCING;
     else
       status_.summary = sync_api::SyncManager::Status::READY;
   } else if (!status_.initial_sync_ended) {
     status_.summary = sync_api::SyncManager::Status::OFFLINE_UNUSABLE;
   } else if (unsynced_changes) {
     status_.summary = sync_api::SyncManager::Status::OFFLINE_UNSYNCED;
   } else {
     status_.summary = sync_api::SyncManager::Status::OFFLINE;
   }
@@ skipping 79 matching lines @@
     : allstatus_(allstatus) {
   allstatus->mutex_.Acquire();
 }
 
 ScopedStatusLock::~ScopedStatusLock() {
   allstatus_->CalcStatusChanges();
   allstatus_->mutex_.Release();
 }
 
 }  // namespace browser_sync