Changed api to notify when watched directory is deleted.

chrome/browser/chromeos/extensions/file_manager/event_router.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_EXTENSIONS_FILE_MANAGER_EVENT_ROUTER_H_
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_EVENT_ROUTER_H_
 
 #include <map>
 #include <string>
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path_watcher.h"
 #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/file_manager/file_watcher.h"
@@ skipping 30 matching lines @@
 // 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 content::NotificationObserver {
  public:
+  typedef base::Callback<void
+      (const base::FilePath& virtual_path,
+       const drive::FileChange* list,
+       bool got_error,
+       const std::vector<std::string>& extension_ids)>
+      DispatchDirectoryChangeEventImplCallback;
+
   explicit EventRouter(Profile* profile);
   virtual ~EventRouter();
 
   // KeyedService overrides.
   virtual void Shutdown() override;
 
   typedef base::Callback<void(bool success)> BoolCallback;
 
   // Adds a file watch at |local_path|, associated with |virtual_path|, for
   // an extension with |extension_id|.
@@ skipping 55 matching lines @@
   virtual void OnFormatStarted(
       const std::string& device_path, bool success) override;
   virtual void OnFormatCompleted(
       const std::string& device_path, bool success) override;
 
   // content::NotificationObserver overrides.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) override;
 
+  // Set custom dispatch directory change event implementation for testing.
+  void SetDispatchDirectoryChangeEventImplForTesting(
+      const DispatchDirectoryChangeEventImplCallback& callback);
+
  private:
   typedef std::map<base::FilePath, FileWatcher*> WatcherMap;
 
   // Starts observing file system change events.
   void ObserveEvents();
 
   // Called when prefs related to file manager change.
   void OnFileManagerPrefsChanged();
 
   // Process file watch notifications.
   void HandleFileWatchNotification(const drive::FileChange* list,
                                    const base::FilePath& path,
                                    bool got_error);
 
   // Sends directory change event.
   void DispatchDirectoryChangeEvent(
       const base::FilePath& path,
       const drive::FileChange* list,
       bool got_error,
       const std::vector<std::string>& extension_ids);
 
+  void DispatchDirectoryChangeEventImpl(

[mtomasz, 2014/10/17 05:26:56]

nit: Comment is missing.

[yawano, 2014/10/20 00:49:48]

Done.

+      const base::FilePath& path,
+      const drive::FileChange* list,
+      bool got_error,
+      const std::vector<std::string>& extension_ids);
+
   // Sends directory change event, after converting the file definition to entry
   // definition.
   void DispatchDirectoryChangeEventWithEntryDefinition(
       const linked_ptr<drive::FileChange> list,
       const std::string* extension_id,
       bool watcher_error,
       const EntryDefinition& entry_definition);
 
   // Dispatches the mount completed event.
   void DispatchMountCompletedEvent(
@@ skipping 39 matching lines @@
   WatcherMap file_watchers_;
   scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;
   Profile* profile_;
 
   content::NotificationRegistrar notification_registrar_;
 
   scoped_ptr<DeviceEventRouter> device_event_router_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<EventRouter> weak_factory_;

[mtomasz, 2014/10/17 05:26:56]

Please keep weak_factory_ as the last member. See the comment for it.

[yawano, 2014/10/20 00:49:48]

Done.

+
+  DispatchDirectoryChangeEventImplCallback

[mtomasz, 2014/10/17 05:26:56]

(No need for a comment for trivial members).

[yawano, 2014/10/20 00:49:48]

Acknowledged.

+      dispatch_directory_change_event_impl_;
+
   DISALLOW_COPY_AND_ASSIGN(EventRouter);
 };
 
 }  // namespace file_manager
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_EVENT_ROUTER_H_