Merge ChromeOS and SyncFS XMPP Notification into one class

chrome/browser/chromeos/drive/drive_system_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_CHROMEOS_DRIVE_DRIVE_SYSTEM_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SYSTEM_SERVICE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive_file_error.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/chromeos/drive/drive_scheduler.h"
+#include "chrome/browser/google_apis/drive_notification_observer.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
-#include "sync/notifier/invalidation_handler.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace google_apis {
 class DriveServiceInterface;
 }
 
 namespace drive {
@@ skipping 26 matching lines @@
  protected:
   virtual ~DriveSystemServiceObserver() {}
 };
 
 // DriveSystemService runs the Drive system, including the Drive file system
 // implementation for the file manager, and some other sub systems.
 //
 // The class is essentially a container that manages lifetime of the objects
 // that are used to run the Drive system. The DriveSystemService object is
 // created per-profile.
-class DriveSystemService : public ProfileKeyedService,
-                           public syncer::InvalidationHandler {
+class DriveSystemService
+    : public ProfileKeyedService,
+      public google_apis::DriveNotificationObserver {
  public:
   // test_drive_service, test_cache_root and test_file_system are used by tests
   // to inject customized instances.
   // Pass NULL or the empty value when not interested.
   DriveSystemService(Profile* profile,
                      google_apis::DriveServiceInterface* test_drive_service,
                      const base::FilePath& test_cache_root,
                      DriveFileSystemInterface* test_file_system);
   virtual ~DriveSystemService();
 
   // Initializes the object. This function should be called before any
   // other functions.
   void Initialize();
 
   // ProfileKeyedService override:
   virtual void Shutdown() OVERRIDE;
 
   // Adds and removes the observer.
   void AddObserver(DriveSystemServiceObserver* observer);
   void RemoveObserver(DriveSystemServiceObserver* observer);
 
+  // google_apis::DriveNotificationObserver implementation.
+  virtual void CheckForUpdates() OVERRIDE;

[satorux1, 2013/04/19 07:28:25]

I found it rather unusual for a function name of an observer class. I think
functions in observer classes usually look like OnBlahBlah().

In this case, something like OnNotificationArrived() would be nicer. what do you
think?

[calvinlo, 2013/04/19 07:54:06]

Done. Originally I called it CheckForUpdates because it could have been called
from either getting an XMPP Notification or from the polling timer hitting 0.
Since there's only XMPP notifications now, OnNotificationReceived() would be an
appropriate name.

+
   google_apis::DriveServiceInterface* drive_service() {
     return drive_service_.get();
   }
 
   DriveCache* cache() { return cache_.get(); }
   DriveFileSystemInterface* file_system() { return file_system_.get(); }
   FileWriteHelper* file_write_helper() { return file_write_helper_.get(); }
   DriveDownloadHandler* download_handler() { return download_handler_.get(); }
   DriveWebAppsRegistry* webapps_registry() { return webapps_registry_.get(); }
   EventLogger* event_logger() { return event_logger_.get(); }
   JobListInterface* job_list() { return scheduler_.get(); }
 
   // Clears all the local cache files and in-memory data, and remounts the
   // file system. |callback| is called with true when this operation is done
   // successfully. Otherwise, |callback| is called with false.
   // |callback| must not be null.
   void ClearCacheAndRemountFileSystem(
       const base::Callback<void(bool)>& callback);
 
   // Reloads and remounts the file system.
   void ReloadAndRemountFileSystem();
 
-  // Returns true if the push notification is enabled.
-  bool PushNotificationEnabled();
-
  private:
-  // syncer::InvalidationHandler implementation.
-  virtual void OnInvalidatorStateChange(
-      syncer::InvalidatorState state) OVERRIDE;
-  virtual void OnIncomingInvalidation(
-      const syncer::ObjectIdInvalidationMap& invalidation_map) OVERRIDE;
-
   // Returns true if Drive is enabled.
   // Must be called on UI thread.
   bool IsDriveEnabled();
 
   // Registers remote file system proxy for drive mount point.
   void AddDriveMountPoint();
   // Unregisters drive mount point from File API.
   void RemoveDriveMountPoint();
 
   // Reinitializes |resource_metadata_|.
@@ skipping 19 matching lines @@
   // the Drive cache failed).
   // Must be called on UI thread.
   void DisableDrive();
 
   friend class DriveSystemServiceFactory;
 
   Profile* profile_;
   // True if Drive is disabled due to initialization errors.
   bool drive_disabled_;
 
-  // True once this is registered to listen to the Drive updates.
-  bool push_notification_registered_;
-
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
   scoped_ptr<EventLogger> event_logger_;
   scoped_ptr<DriveCache, util::DestroyHelper> cache_;
   scoped_ptr<google_apis::DriveServiceInterface> drive_service_;
   scoped_ptr<DriveScheduler> scheduler_;
   scoped_ptr<DriveWebAppsRegistry> webapps_registry_;
   scoped_ptr<DriveResourceMetadata, util::DestroyHelper> resource_metadata_;
   scoped_ptr<DriveFileSystemInterface> file_system_;
   scoped_ptr<FileWriteHelper> file_write_helper_;
   scoped_ptr<DriveDownloadHandler> download_handler_;
@@ skipping 56 matching lines @@
   // ProfileKeyedServiceFactory:
   virtual ProfileKeyedService* BuildServiceInstanceFor(
       Profile* profile) const OVERRIDE;
 
   FactoryCallback factory_for_test_;
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SYSTEM_SERVICE_H_