Merge ChromeOS and SyncFS XMPP Notification into one class

chrome/browser/sync_file_system/drive_file_sync_service.h

Index: chrome/browser/sync_file_system/drive_file_sync_service.h
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.h b/chrome/browser/sync_file_system/drive_file_sync_service.h
index d26ee1159c9bb914970d209f72d5eec0c9cbe749..c196f99fa28bb368223d6f1e2b326ece8e3ef065 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.h
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.h
@@ -11,12 +11,12 @@
 #include <string>
 #include <vector>
 
+#include "base/callback.h"

[kinaba, 2013/04/19 10:05:40]

fyi: if you include callback.h, the callback_forward.h is not necessary,

[calvinlo, 2013/04/19 10:22:09]

Done.

 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
-#include "base/timer.h"
 #include "chrome/browser/google_apis/drive_notification_observer.h"
 #include "chrome/browser/sync_file_system/drive_file_sync_client_interface.h"
 #include "chrome/browser/sync_file_system/drive_metadata_store.h"
@@ -115,7 +115,7 @@ class DriveFileSyncService
   virtual void OnNetworkConnected() OVERRIDE;
 
   // google_apis::DriveNotificationObserver implementation.
-  virtual void CheckForUpdates() OVERRIDE;
+  virtual void OnNotificationReceived() OVERRIDE;
 
  private:
   friend class DriveFileSyncServiceMockTest;
@@ -428,9 +428,6 @@ class DriveFileSyncService
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::ResourceList> changes);
   bool GetOriginForEntry(const google_apis::ResourceEntry& entry, GURL* origin);
-  void SchedulePolling();
-  void OnPollingTimerFired();
-  void UpdatePollingDelay(int64 new_delay_sec);
   void NotifyObserversFileStatusChanged(const fileapi::FileSystemURL& url,
                                         SyncFileStatus sync_status,
                                         SyncAction action_taken,
@@ -492,11 +489,6 @@ class DriveFileSyncService
   // NotifyTaskDone when the task finished.
   scoped_ptr<TaskToken> token_;
 
-  // Timer to trigger fetching changes for incremental sync.
-  base::OneShotTimer<DriveFileSyncService> polling_timer_;
-  // If polling_delay_seconds_ is negative (<0) the timer won't start.
-  int64 polling_delay_seconds_;
-
   // Is set to true when there's a fair possibility that we have some
   // remote changes that haven't been fetched yet.
   //