[SyncFS] Eliminate SyncFileSystemService dependency from SyncProcessRunner

chrome/browser/sync_file_system/sync_process_runner.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/sync_file_system/sync_process_runner.h"
 
 #include "base/format_macros.h"
 #include "chrome/browser/sync_file_system/logger.h"
-#include "chrome/browser/sync_file_system/sync_file_system_service.h"
 
 namespace sync_file_system {
 
 namespace {
 
 // Default delay when more changes are available.
 const int64 kSyncDelayInMilliseconds = 1 * base::Time::kMillisecondsPerSecond;
 
 // Default delay when the previous change has had an error (but remote service
 // is running).
@@ skipping 39 matching lines @@
          status == SYNC_STATUS_NO_CONFLICT ||
          status == SYNC_STATUS_NO_CHANGE_TO_SYNC ||
          status == SYNC_STATUS_UNKNOWN_ORIGIN ||
          status == SYNC_STATUS_RETRY;
 }
 
 }  // namespace
 
 SyncProcessRunner::SyncProcessRunner(
     const std::string& name,
-    SyncFileSystemService* sync_service,
+    Client* client,
     scoped_ptr<TimerHelper> timer_helper,
     int max_parallel_task)
     : name_(name),
-      sync_service_(sync_service),
+      client_(client),
       max_parallel_task_(max_parallel_task),
       running_tasks_(0),
       timer_helper_(timer_helper.Pass()),
       current_delay_(0),
       last_delay_(0),
       pending_changes_(0),
       factory_(this) {
   DCHECK_LE(1, max_parallel_task_);
 
   DCHECK_EQ(1, max_parallel_task_)
@@ skipping 39 matching lines @@
     Schedule();
 }
 
 void SyncProcessRunner::OnChangesUpdated(
     int64 pending_changes) {
   DCHECK_GE(pending_changes, 0);
   int64 old_pending_changes = pending_changes_;
   pending_changes_ = pending_changes;
   if (old_pending_changes != pending_changes) {
     if (pending_changes == 0)
-      sync_service()->OnSyncIdle();
+      client_->OnSyncIdle();
     util::Log(logging::LOG_VERBOSE, FROM_HERE,
               "[%s] pending_changes updated: %" PRId64,
               name_.c_str(), pending_changes);
   }
   Schedule();
 }
 
+SyncFileSystemService* SyncProcessRunner::GetSyncService() {
+  return client_->GetSyncService();
+}
+
 SyncServiceState SyncProcessRunner::GetServiceState() {
-  return sync_service()->GetSyncServiceState();
+  return client_->GetSyncServiceState();
 }
 
 void SyncProcessRunner::Finished(const base::TimeTicks& start_time,
                                  SyncStatusCode status) {
   DCHECK_LT(0, running_tasks_);
   DCHECK_LE(running_tasks_, max_parallel_task_);
   --running_tasks_;
   util::Log(logging::LOG_VERBOSE, FROM_HERE,
             "[%s] * Finished (elapsed: %" PRId64 " sec)",
             name_.c_str(),
@@ skipping 44 matching lines @@
               name_.c_str(), time_to_next.InSeconds());
   }
   current_delay_ = delay;
 
   timer_helper_->Start(
       FROM_HERE, time_to_next,
       base::Bind(&SyncProcessRunner::Run, base::Unretained(this)));
 }
 
 }  // namespace sync_file_system