Remove broken variables from sync's AllStatus

chrome/browser/sync/sessions/session_state.h

 // Copyright (c) 2012 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.
 
 // The 'sessions' namespace comprises all the pieces of state that are
 // combined to form a SyncSession instance. In that way, it can be thought of
 // as an extension of the SyncSession type itself. Session scoping gives
 // context to things like "conflict progress", "update progress", etc, and the
 // separation this file provides allows clients to only include the parts they
 // need rather than the entire session stack.
@@ skipping 47 matching lines @@
 // Data pertaining to the status of an active Syncer object.
 struct SyncerStatus {
   SyncerStatus();
   ~SyncerStatus();
 
   // Caller takes ownership of the returned dictionary.
   base::DictionaryValue* ToValue() const;
 
   // True when we get such an INVALID_STORE error from the server.
   bool invalid_store;
-  // True iff we're stuck.
-  bool syncer_stuck;
   int num_successful_commits;
   // This is needed for monitoring extensions activity.
   int num_successful_bookmark_commits;
 
   // Download event counters.
   int num_updates_downloaded_total;
   int num_tombstone_updates_downloaded_total;
 
   // If the syncer encountered a MIGRATION_DONE code, these are the types that
   // the client must now "migrate", by purging and re-downloading all updates.
@@ skipping 113 matching lines @@
 
   void MergeSets(const syncable::Id& set1, const syncable::Id& set2);
   void CleanupSets();
 
  private:
   // TODO(sync): move away from sets if it makes more sense.
   std::set<syncable::Id> conflicting_item_ids_;
   std::map<syncable::Id, ConflictSet*> id_to_conflict_set_;
   std::set<ConflictSet*> conflict_sets_;
 
-  // Nonblocking conflicts are those which should not block forward progress
-  // (they will not result in the syncer being stuck). This currently only
-  // includes entries we cannot yet decrypt because the passphrase has not
-  // arrived.
-  // With nonblocking conflicts, we want to go to the syncer's
-  // APPLY_UPDATES_TO_RESOLVE_CONFLICTS step, but we want to ignore them after.
-  // Because they are not passed to the conflict resolver, they do not trigger
-  // syncer_stuck.
-  // TODO(zea): at some point we may have nonblocking conflicts that should be
-  // resolved in the conflict resolver. We'll need to change this then.
-  // See http://crbug.com/76596.
+  // Nonblocking conflicts are not processed by the conflict resolver, but
+  // they will be processed in the APPLY_UDPATES_TO_RESOLVE_CONFLICTS step.
   std::set<syncable::Id> nonblocking_conflicting_item_ids_;
 
   // Whether a conflicting item was added or removed since
   // the last call to reset_progress_changed(), if any. In practice this
   // points to StatusController::is_dirty_.
   bool* dirty_;
 };
 
 typedef std::pair<VerifyResult, sync_pb::SyncEntity> VerifiedUpdate;
 typedef std::pair<UpdateAttemptResponse, syncable::Id> AppliedUpdate;
@@ skipping 116 matching lines @@
   ~PerModelSafeGroupState();
 
   UpdateProgress update_progress;
   ConflictProgress conflict_progress;
 };
 
 }  // namespace sessions
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_SESSIONS_SESSION_STATE_H_