Merge ChromeOS and SyncFS XMPP Notification into one class

chrome/browser/google_apis/drive_notification_manager.h

Index: chrome/browser/google_apis/drive_notification_manager.h
diff --git a/chrome/browser/google_apis/drive_notification_manager.h b/chrome/browser/google_apis/drive_notification_manager.h
index 16905db5b7c885977779a80d3e3d922ef1459972..e8dadaf669d6617b87d363aa4941da1ea35b343f 100644
--- a/chrome/browser/google_apis/drive_notification_manager.h
+++ b/chrome/browser/google_apis/drive_notification_manager.h
@@ -11,15 +11,14 @@
 #include "sync/notifier/invalidation_handler.h"
 
 class Profile;
+class ProfileSyncService;
 
 namespace google_apis {
 
 // Informs observers when they should check Google Drive for updates.
 // Conditions under which updates should be searched:
 // 1. XMPP invalidation is received from Google Drive.
-//    TODO(calvinlo): Implement public syncer::InvalidationHandler interface.
 // 2. Polling timer counts down.
-//    TODO(calvinlo): Also add in backup timer.
 class DriveNotificationManager
     : public ProfileKeyedService,
       public syncer::InvalidationHandler {
@@ -39,25 +38,21 @@ class DriveNotificationManager
   void AddObserver(DriveNotificationObserver* observer);
   void RemoveObserver(DriveNotificationObserver* observer);
 
+  // True when XMPP notifications registered and enabled. False otherwise.
+  bool IsPushNotificationEnabled();
+
  private:
   void NotifyObserversToUpdate();
-
-  // XMPP notification related methods.
   void RegisterDriveNotifications();
-  bool IsDriveNotificationSupported();
-  void SetPushNotificationEnabled(syncer::InvalidatorState state);
 
   Profile* profile_;
   ObserverList<DriveNotificationObserver> observers_;
 
-  // XMPP notification related variables.
   // True when Drive File Sync Service is registered for Drive notifications.
   bool push_notification_registered_;
   // True once the first drive notification is received with OK state.
   bool push_notification_enabled_;
 
-  // TODO(calvinlo): Polling variables to go here.
-
   DISALLOW_COPY_AND_ASSIGN(DriveNotificationManager);
 };