Revert 237913 "Revert 237896 "Use multiple RemoteFileSyncService..."

> Revert 237896 "Use multiple RemoteFileSyncService depends on origin"
> 
> This might cause Linux Tests (tsan) failure.
> 
> http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20%28tsan%29%283%29/builds/8699
> 
> > Use multiple RemoteFileSyncService depends on origin
> > 
> > Lazily instantiate and use v2 RemoteFileSyncService if V2 is enabled
> > only for the origin.
> > 
> > BUG=324215
> > TEST=none
> > NOTRY=true
> > 
> > Review URL: https://codereview.chromium.org/96253002
> 
> TBR=kinuko@chromium.org
> 
> Review URL: https://codereview.chromium.org/96593003

TBR=nhiroki@chromium.org

Review URL: https://codereview.chromium.org/96613004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237918 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 1 deletions

diff --git a/chrome/browser/sync_file_system/sync_process_runner.h b/chrome/browser/sync_file_system/sync_process_runner.h
index 792f311..c007f40 100644
--- a/chrome/browser/sync_file_system/sync_process_runner.h
+++ b/chrome/browser/sync_file_system/sync_process_runner.h
@@ -9,6 +9,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/sync_file_system/sync_callbacks.h"
+#include "chrome/browser/sync_file_system/sync_service_state.h"
 
 namespace sync_file_system {
 
@@ -27,15 +28,21 @@ class SyncProcessRunner {
                     SyncFileSystemService* sync_service);
   virtual ~SyncProcessRunner();
 
+  // Subclass must implement this.
   virtual void StartSync(const SyncStatusCallback& callback) = 0;
 
+  // Schedules a new sync.
   void Schedule();
   void ScheduleIfNotRunning();
-  void OnChangesUpdated(int64 pending_changes);
 
  protected:
+  void OnChangesUpdated(int64 pending_changes);
   SyncFileSystemService* sync_service() { return sync_service_; }
 
+  // Returns the current service state.  Default implementation returns
+  // sync_service()->GetSyncServiceState().
+  virtual SyncServiceState GetServiceState();
+
  private:
   void Finished(SyncStatusCode status);
   void Run();