sync: use progress markers instead of timestamps during GetUpdates

chrome/browser/sync/sessions/status_controller.h

 // Copyright (c) 2009 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.
 
 // StatusController handles all counter and status related number crunching and
 // state tracking on behalf of a SyncSession.  It 'controls' the model data
 // defined in session_state.h.  The most important feature of StatusController
 // is the ScopedModelSafetyRestriction. When one of these is active, the
 // underlying data set exposed via accessors is swapped out to the appropriate
 // set for the restricted ModelSafeGroup behind the scenes.  For example, if
 // GROUP_UI is set, then accessors such as conflict_progress() and commit_ids()
 // are implicitly restricted to returning only data pertaining to GROUP_UI.
-// You can see which parts of status fall into this "restricted" category, the
-// global "shared" category for all model types, or the single per-model type
-// category by looking at the struct declarations in session_state.h.
-// If these accessors are invoked without a restriction in place, this is a
-// violation and will cause debug assertions to surface improper use of the API
-// in development.  Likewise for invocation of "shared" accessors when a
-// restriction is in place; for safety's sake, an assertion will fire.
+// You can see which parts of status fall into this "restricted" category, or
+// the global "shared" category for all model types, by looking at the struct
+// declarations in session_state.h. If these accessors are invoked without a
+// restriction in place, this is a violation and will cause debug assertions
+// to surface improper use of the API in development.  Likewise for
+// invocation of "shared" accessors when a restriction is in place; for
+// safety's sake, an assertion will fire.
 //
 // NOTE: There is no concurrent access protection provided by this class. It
 // assumes one single thread is accessing this class for each unique
 // ModelSafeGroup, and also only one single thread (in practice, the
 // SyncerThread) responsible for all "shared" access when no restriction is in
 // place. Thus, every bit of data is to be accessed mutually exclusively with
 // respect to threads.
 //
 // StatusController can also track if changes occur to certain parts of state
 // so that various parts of the sync engine can avoid broadcasting
@@ skipping 50 matching lines @@
   }
   ClientToServerMessage* mutable_commit_message() {
     return &shared_.commit_message;
   }
   const ClientToServerResponse& commit_response() const {
     return shared_.commit_response;
   }
   ClientToServerResponse* mutable_commit_response() {
     return &shared_.commit_response;
   }
-  const syncable::MultiTypeTimeStamp& updates_request_parameters() const {
-    return shared_.updates_request_parameters;
+  const syncable::ModelTypeBitSet& updates_request_types() const {
+    return shared_.updates_request_types;
   }
-  void set_updates_request_parameters(
-      const syncable::MultiTypeTimeStamp& value) {
-    shared_.updates_request_parameters = value;
+  void set_updates_request_types(const syncable::ModelTypeBitSet& value) {
+    shared_.updates_request_types = value;
   }
   const ClientToServerResponse& updates_response() const {
     return shared_.updates_response;
   }
   ClientToServerResponse* mutable_updates_response() {
     return &shared_.updates_response;
   }
 
   // Errors and SyncerStatus.
   const ErrorCounters& error_counters() const {
     return shared_.error_counters.value();
   }
   const SyncerStatus& syncer_status() const {
     return shared_.syncer_status.value();
   }
 
   // Changelog related state.
   int64 num_server_changes_remaining() const {
     return shared_.num_server_changes_remaining.value();
   }
-  // Aggregate max over all data type timestamps, used for UI reporting.
-  int64 ComputeMaxLocalTimestamp() const;
 
   // Commit path data.
   const std::vector<syncable::Id>& commit_ids() const {
     DCHECK(!group_restriction_in_effect_) << "Group restriction in effect!";
     return shared_.commit_set.GetAllCommitIds();
   }
   const OrderedCommitSet::Projection& commit_id_projection() {
     DCHECK(group_restriction_in_effect_)
         << "No group restriction for projection.";
     return shared_.commit_set.GetCommitIdProjection(group_restriction_);
@@ skipping 71 matching lines @@
   }
 
   // A toolbelt full of methods for updating counters and flags.
   void increment_num_conflicting_commits_by(int value);
   void reset_num_conflicting_commits();
   void set_num_consecutive_transient_error_commits(int value);
   void increment_num_consecutive_transient_error_commits_by(int value);
   void set_num_consecutive_errors(int value);
   void increment_num_consecutive_errors();
   void increment_num_consecutive_errors_by(int value);
-  void set_current_download_timestamp(syncable::ModelType model,
-                                      int64 current_timestamp);
   void set_num_server_changes_remaining(int64 changes_remaining);
   void set_invalid_store(bool invalid_store);
   void set_syncer_stuck(bool syncer_stuck);
   void set_syncing(bool syncing);
   void set_num_successful_bookmark_commits(int value);
   void increment_num_successful_commits();
   void increment_num_successful_bookmark_commits();
+  void increment_num_updates_downloaded_by(int value);
+  void increment_num_tombstone_updates_downloaded_by(int value);
   void set_unsynced_handles(const std::vector<int64>& unsynced_handles);
 
   void set_commit_set(const OrderedCommitSet& commit_set);
   void update_conflict_sets_built(bool built);
   void update_conflicts_resolved(bool resolved);
   void reset_conflicts_resolved();
   void set_items_committed();
 
  private:
   friend class ScopedModelSafeGroupRestriction;
 
   // Returns true iff the commit id projection for |group_restriction_|
   // references position |index| into the full set of commit ids in play.
   bool CurrentCommitIdProjectionHasIndex(size_t index);
 
   // Helper to lazily create objects for per-ModelSafeGroup state.
   PerModelSafeGroupState* GetOrCreateModelSafeGroupState(bool restrict,
                                                          ModelSafeGroup group);
-  // Helper to lazily create objects for per-model type state.
-  PerModelTypeState* GetOrCreateModelTypeState(bool restrict,
-                                               syncable::ModelType model);
 
   AllModelTypeState shared_;
   std::map<ModelSafeGroup, PerModelSafeGroupState*> per_model_group_;
-  std::map<syncable::ModelType, PerModelTypeState*> per_model_type_;
 
   STLValueDeleter<std::map<ModelSafeGroup, PerModelSafeGroupState*> >
       per_model_group_deleter_;
-  STLValueDeleter<std::map<syncable::ModelType, PerModelTypeState*> >
-      per_model_type_deleter_;
 
   // Set to true if any DirtyOnWrite pieces of state we maintain are changed.
   // Reset to false by TestAndClearIsDirty.
   bool is_dirty_;
 
   // Used to fail read/write operations on state that don't obey the current
   // active ModelSafeWorker contract.
   bool group_restriction_in_effect_;
   ModelSafeGroup group_restriction_;
 
@@ skipping 19 matching lines @@
   }
  private:
   StatusController* status_;
   DISALLOW_COPY_AND_ASSIGN(ScopedModelSafeGroupRestriction);
 };
 
 }
 }
 
 #endif  // CHROME_BROWSER_SYNC_SESSIONS_STATUS_CONTROLLER_H_