sync: Refactor per-datatype throttling

sync/internal_api/sync_manager.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.
 
 #ifndef SYNC_INTERNAL_API_SYNC_MANAGER_H_
 #define SYNC_INTERNAL_API_SYNC_MANAGER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "base/time.h"
 #include "sync/internal_api/change_record.h"
 #include "sync/internal_api/configure_reason.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
+#include "sync/internal_api/public/engine/sync_status.h"
 #include "sync/internal_api/public/syncable/model_type.h"
 #include "sync/protocol/sync_protocol_error.h"
 #include "sync/util/report_unrecoverable_error_function.h"
 #include "sync/util/unrecoverable_error_handler.h"
 #include "sync/util/weak_handle.h"
 
 namespace browser_sync {
 class Encryptor;
 struct Experiments;
 class ExtensionsActivityMonitor;
@@ skipping 52 matching lines @@
 // SyncManager for the lifetime of a user session.
 //
 // Unless stated otherwise, all methods of SyncManager should be called on the
 // same thread.
 class SyncManager {
  public:
   // SyncInternal contains the implementation of SyncManager, while abstracting
   // internal types from clients of the interface.
   class SyncInternal;
 
-  // Status encapsulates detailed state about the internals of the SyncManager.
-  struct Status {
-    Status();
-    ~Status();
-
-    bool notifications_enabled;  // True only if subscribed for notifications.
-
-    // Notifications counters updated by the actions in synapi.
-    int notifications_received;
-
-    browser_sync::SyncProtocolError sync_protocol_error;
-
-    // Number of encryption conflicts counted during most recent sync cycle.
-    int encryption_conflicts;
-
-    // Number of hierarchy conflicts counted during most recent sync cycle.
-    int hierarchy_conflicts;
-
-    // Number of simple conflicts counted during most recent sync cycle.
-    int simple_conflicts;
-
-    // Number of items the server refused to commit due to conflict during most
-    // recent sync cycle.
-    int server_conflicts;
-
-    // Number of items successfully committed during most recent sync cycle.
-    int committed_count;
-
-    bool syncing;
-    // True after a client has done a first sync.
-    bool initial_sync_ended;
-
-    // Total updates available.  If zero, nothing left to download.
-    int64 updates_available;
-    // Total updates received by the syncer since browser start.
-    int updates_received;
-    // Total updates received that are echoes of our own changes.
-    int reflected_updates_received;
-    // Of updates_received, how many were tombstones.
-    int tombstone_updates_received;
-
-    // Total successful commits.
-    int num_commits_total;
-
-    // Total number of overwrites due to conflict resolver since browser start.
-    int num_local_overwrites_total;
-    int num_server_overwrites_total;
-
-    // Count of empty and non empty getupdates;
-    int nonempty_get_updates;
-    int empty_get_updates;
-
-    // Count of sync cycles that successfully committed items;
-    int sync_cycles_with_commits;
-    int sync_cycles_without_commits;
-
-    // Count of useless and useful syncs we perform.
-    int useless_sync_cycles;
-    int useful_sync_cycles;
-
-    // Encryption related.
-    syncable::ModelTypeSet encrypted_types;
-    bool cryptographer_ready;
-    bool crypto_has_pending_keys;
-
-    // The unique identifer for this client.
-    std::string unique_id;
-  };
-
   // An interface the embedding application implements to be notified
   // on change events.  Note that these methods may be called on *any*
   // thread.
   class ChangeDelegate {
    public:
     // Notify the delegate that changes have been applied to the sync model.
     //
     // This will be invoked on the same thread as on which ApplyChanges was
     // called. |changes| is an array of size |change_count|, and contains the
     // ID of each individual item that was changed. |changes| exists only for
@@ skipping 349 matching lines @@
   // NOTE: It is OK (in fact, it's probably a good idea) to call this before
   // having received OnInitializationCompleted.
   void AddObserver(Observer* observer);
 
   // Remove the given observer.  Make sure to call this if the
   // Observer is being destroyed so the SyncManager doesn't
   // potentially dereference garbage.
   void RemoveObserver(Observer* observer);
 
   // Status-related getter.  May be called on any thread.
-  Status GetDetailedStatus() const;
+  SyncStatus GetDetailedStatus() const;
 
   // Whether or not the Nigori node is encrypted using an explicit passphrase.
   // May be called on any thread.
   bool IsUsingExplicitPassphrase();
 
   // Call periodically from a database-safe thread to persist recent changes
   // to the syncapi model.
   void SaveChanges();
 
   // Initiates shutdown of various components in the sync engine.  Must be
@@ skipping 89 matching lines @@
     sync_api::UserShare* share);
 
 const char* ConnectionStatusToString(ConnectionStatus status);
 
 // Returns the string representation of a PassphraseRequiredReason value.
 const char* PassphraseRequiredReasonToString(PassphraseRequiredReason reason);
 
 }  // namespace sync_api
 
 #endif  // SYNC_INTERNAL_API_SYNC_MANAGER_H_