Files.app: Replace job related code in EventRouter with new JobEventRoter class.

chrome/browser/chromeos/extensions/file_manager/event_router.h

Index: chrome/browser/chromeos/extensions/file_manager/event_router.h
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.h b/chrome/browser/chromeos/extensions/file_manager/event_router.h
index 40c268e2bfeaedb52d880f4028673af164c1fca3..a242f36e1632d6cca8ca677dacf9755b9c757316 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.h
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.h
@@ -15,8 +15,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_observer.h"
-#include "chrome/browser/chromeos/drive/job_list.h"
 #include "chrome/browser/chromeos/drive/sync_client.h"
+#include "chrome/browser/chromeos/extensions/file_manager/device_event_router.h"
+#include "chrome/browser/chromeos/extensions/file_manager/job_event_router.h"
 #include "chrome/browser/chromeos/file_manager/file_watcher.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
@@ -46,14 +47,12 @@ class FileChange;
 }
 
 namespace file_manager {
-class DeviceEventRouter;
 
 // Monitors changes in disk mounts, network connection state and preferences
 // affecting File Manager. Dispatches appropriate File Browser events.
 class EventRouter : public KeyedService,
                     public chromeos::NetworkStateHandlerObserver,
                     public drive::FileSystemObserver,
-                    public drive::JobListObserver,
                     public drive::DriveServiceObserver,
                     public VolumeManagerObserver {
  public:
@@ -112,12 +111,6 @@ class EventRouter : public KeyedService,
   // chromeos::NetworkStateHandlerObserver overrides.
   void DefaultNetworkChanged(const chromeos::NetworkState* network) override;
 
-  // drive::JobListObserver overrides.
-  void OnJobAdded(const drive::JobInfo& job_info) override;
-  void OnJobUpdated(const drive::JobInfo& job_info) override;
-  void OnJobDone(const drive::JobInfo& job_info,
-                 drive::FileError error) override;
-
   // drive::DriveServiceObserver overrides.
   void OnRefreshTokenInvalid() override;
   void OnReadyToSendRequests() override;
@@ -197,15 +190,6 @@ class EventRouter : public KeyedService,
   void ShowRemovableDeviceInFileManager(VolumeType type,
                                         const base::FilePath& mount_path);
 
-  // Manages the list of currently active Drive file transfer jobs.
-  struct DriveJobInfoWithStatus {
-    DriveJobInfoWithStatus();
-    DriveJobInfoWithStatus(const drive::JobInfo& info,
-                           const std::string& status);
-    drive::JobInfo job_info;
-    std::string status;
-  };
-
   // Sends onFileTransferUpdate event right now if |immediate| is set. Otherwise
   // it refrains from sending for a short while, and after that it sends the
   // most recently scheduled event once.
@@ -221,16 +205,14 @@ class EventRouter : public KeyedService,
   // This is used for implementing ScheduledDriveFileTransferEvent().
   void SendDriveFileTransferEvent();
 
-  std::map<drive::JobID, DriveJobInfoWithStatus> drive_jobs_;
-  scoped_ptr<DriveJobInfoWithStatus> drive_job_info_for_scheduled_event_;
   base::Time last_copy_progress_event_;
-  base::Time next_send_file_transfer_event_;
 
   WatcherMap file_watchers_;
   scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;
   Profile* profile_;
 
   scoped_ptr<DeviceEventRouter> device_event_router_;
+  scoped_ptr<JobEventRouter> job_event_router_;
 
   DispatchDirectoryChangeEventImplCallback
       dispatch_directory_change_event_impl_;