sync: SyncableService support for starting sync

chrome/browser/sync/profile_sync_service.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 CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 
 #include <list>
 #include <string>
 #include <utility>
@@ skipping 607 matching lines @@
 
   // ProfileKeyedService implementation.  This must be called exactly
   // once (before this object is destroyed).
   virtual void Shutdown() OVERRIDE;
 
   // Simulate an incoming notification for the given id and payload.
   void EmitInvalidationForTest(
       const invalidation::ObjectId& id,
       const std::string& payload);
 
+  // Called when a datatype (SyncableService) has a need for sync to start
+  // ASAP, presumably because a local change event has occurred but we're
+  // still in deferred start mode, meaning the SyncableService hasn't been
+  // told to MergeDataAndStartSyncing yet.
+  void OnDataTypeRequestsSyncStartup(syncer::ModelType type);
+
  protected:
   // Used by test classes that derive from ProfileSyncService.
   virtual browser_sync::SyncBackendHost* GetBackendForTest();
 
   // Helper to configure the priority data types.
   void ConfigurePriorityDataTypes();
 
   // Helper to install and configure a data type manager.
   void ConfigureDataTypeManager();
 
@@ skipping 97 matching lines @@
   void ClearStaleErrors();
 
   void ClearUnrecoverableError();
 
   enum StartUpDeferredOption {
     STARTUP_BACKEND_DEFERRED,
     STARTUP_IMMEDIATE
   };
   void StartUp(StartUpDeferredOption deferred_option);
 
-  // Starts up the backend sync components. |deferred_option| specifies whether
-  // this is being called as part of an immediate startup or startup was
-  // originally deferred and we're finally getting around to finishing.
-  void StartUpSlowBackendComponents(StartUpDeferredOption deferred_option);
+  // Starts up the backend sync components.
+  void StartUpSlowBackendComponents();
 
   // About-flags experiment names for datatypes that aren't enabled by default
   // yet.
   static std::string GetExperimentNameForDataType(
       syncer::ModelType data_type);
 
   // Create and register a new datatype controller.
   void RegisterNewDataType(syncer::ModelType data_type);
 
   // Helper method to process SyncConfigureDone after unwinding the stack that
@@ skipping 59 matching lines @@
 
   // The last time we detected a successful transition from SYNCING state.
   // Our backend notifies us whenever we should take a new snapshot.
   base::Time last_synced_time_;
 
   // The time that StartUp() is called.  This member is zero if StartUp() has
   // never been called, and is reset to zero once OnBackendInitialized() is
   // called.
   base::Time start_up_time_;
 
+  // Whether we have received a signal from a SyncableService requesting that
+  // sync starts as soon as possible.
+  // TODO(tim): Move this and other TryStart related logic + state to separate
+  // class. Bug 80149.
+  bool data_type_requested_sync_startup_;
+
   // The time that OnConfigureStart is called. This member is zero if
   // OnConfigureStart has not yet been called, and is reset to zero once
   // OnConfigureDone is called.
   base::Time sync_configure_start_time_;
 
   // Indicates if this is the first time sync is being configured.  This value
   // is equal to !HasSyncSetupCompleted() at the time of OnBackendInitialized().
   bool is_first_time_sync_configure_;
 
   // List of available data type controllers.
@@ skipping 99 matching lines @@
   syncer::WeakHandle<syncer::DataTypeDebugInfoListener> debug_info_listener_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 bool ShouldShowActionOnUI(
     const syncer::SyncProtocolError& error);
 
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_