Add a receiver interface to RemovableStorageNotifications.

chrome/browser/system_monitor/removable_storage_notifications.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_SYSTEM_MONITOR_REMOVABLE_STORAGE_NOTIFICATIONS_H_
 #define CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_STORAGE_NOTIFICATIONS_H_
 
 #include "base/file_path.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
 
+class ChromeBrowserMainPartsLinux;
+class ChromeBrowserMainPartsMac;
 class MediaGalleriesPrivateApiTest;
 
 namespace chrome {
 
 class RemovableStorageObserver;
 
 // Base class for platform-specific instances watching for removable storage
 // attachments/detachments.
 class RemovableStorageNotifications {
  public:
   struct StorageInfo {
     StorageInfo();
     StorageInfo(const std::string& id,
                 const string16& device_name,
                 const FilePath::StringType& device_location);
 
     // Unique device id - persists between device attachments.
     std::string device_id;
 
     // Human readable removable storage device name.
     string16 name;
 
     // Current attached removable storage device location.
     FilePath::StringType location;
   };
 
-  virtual ~RemovableStorageNotifications();
+  // This interface is provided to generators of storage notifications.
+  class Receiver {
+   public:
+    virtual ~Receiver() {}

[vandebo (ex-Chrome), 2013/01/31 23:51:29]

Put the implementation in the .cc file.

[Greg Billock, 2013/02/01 18:28:43]

Done.

+
+    virtual void ProcessAttach(const StorageInfo& info) = 0;

[vandebo (ex-Chrome), 2013/01/31 23:51:29]

nit: Take the components here and make the StorageInfo internally.  That way
each caller doesn't need to do it.

[Greg Billock, 2013/02/01 18:28:43]

I think we'll end up with more components -- we need to break out the type and
persistent system ID, for instance. This is mainly to preserve function
signatures as that happens.

[vandebo (ex-Chrome), 2013/02/01 18:59:55]

We used to have the type as a separate component and it made things more
complicated.  That's why we have MediaStorageUtil.  Are there other components
that you think we should add?  I have a strong preference for my initial
comment.

[Greg Billock, 2013/02/01 23:05:42]

OK, I can put it back that way. I've been regarding that type as a useful public
format.

On 2013/02/01 18:59:55, vandebo wrote:

+    virtual void ProcessDetach(const std::string& id) = 0;
+  };
 
   // Returns a pointer to an object owned by the BrowserMainParts, with lifetime
   // somewhat shorter than a process Singleton.
   static RemovableStorageNotifications* GetInstance();
 
   // Finds the device that contains |path| and populates |device_info|.
   // Should be able to handle any path on the local system, not just removable
   // storage. Returns false if unable to find the device.
   virtual bool GetDeviceInfoForPath(
       const FilePath& path,
@@ skipping 16 matching lines @@
 #endif
 
   // Returns information for attached removable storage.
   std::vector<StorageInfo> GetAttachedStorage() const;
 
   void AddObserver(RemovableStorageObserver* obs);
   void RemoveObserver(RemovableStorageObserver* obs);
 
  protected:
   RemovableStorageNotifications();
+  virtual ~RemovableStorageNotifications();
 
-  friend class MediaFileSystemRegistryTest;
+  // TODO(gbillock): Clean up ownerships and get rid of these friends.
+  friend class ::ChromeBrowserMainPartsLinux;
+  friend class ::ChromeBrowserMainPartsMac;
   friend class ::MediaGalleriesPrivateApiTest;
-  friend class MediaStorageUtilTest;
-  // TODO(gbillock): remove these friends by making the classes owned by the
-  // platform-specific implementation.
-  friend class MediaTransferProtocolDeviceObserverLinux;
-  friend class PortableDeviceWatcherWin;
-  friend class VolumeMountWatcherWin;
 
-  void ProcessAttach(const std::string& id,
-                     const string16& name,
-                     const FilePath::StringType& location);
-  void ProcessDetach(const std::string& id);
+  scoped_ptr<Receiver> receiver_;

[vandebo (ex-Chrome), 2013/01/31 23:51:29]

Make this private and add a protected getter

[Greg Billock, 2013/02/01 18:28:43]

Done.

 
  private:
+  class ReceiverImpl;
+  friend class ReceiverImpl;
+
   typedef std::map<std::string, StorageInfo> RemovableStorageMap;
 
+  void ProcessAttach(const StorageInfo& storage);
+  void ProcessDetach(const std::string& id);
+
   scoped_refptr<ObserverListThreadSafe<RemovableStorageObserver> >
       observer_list_;
 
   // For manipulating removable_storage_map_ structure.
   mutable base::Lock storage_lock_;
 
   // Map of all the attached removable storage devices.
   RemovableStorageMap storage_map_;
 };
 
 } // namespace chrome
 
 #endif  // CHROME_BROWSER_SYSTEM_MONITOR_REMOVABLE_STORAGE_NOTIFICATIONS_H_