Regularize ownerships and lifecycle for storage monitor platform classes.

chrome/browser/storage_monitor/removable_device_notifications_mac.h

Index: chrome/browser/storage_monitor/removable_device_notifications_mac.h
diff --git a/chrome/browser/storage_monitor/removable_device_notifications_mac.h b/chrome/browser/storage_monitor/removable_device_notifications_mac.h
index 847872e2db3f034502f042b0d5cef73afad932cb..6cad304ed4afb2282beac894c602d754395ce7c9 100644
--- a/chrome/browser/storage_monitor/removable_device_notifications_mac.h
+++ b/chrome/browser/storage_monitor/removable_device_notifications_mac.h
@@ -15,6 +15,8 @@
 
 namespace chrome {
 
+class ImageCaptureDeviceManager;
+
 // This class posts notifications to listeners when a new disk
 // is attached, removed, or changed.
 class RemovableDeviceNotificationsMac
@@ -30,6 +32,8 @@ class RemovableDeviceNotificationsMac
   // Should only be called by browser start up code.  Use GetInstance() instead.
   RemovableDeviceNotificationsMac();
 
+  void Init();

[vandebo (ex-Chrome), 2013/03/01 22:36:41]

Should Init go on StorageMonitor, since we expect all implementations to do two
phase startup?

[Greg Billock, 2013/03/01 23:08:03]

I thought about this. I think we do want two-phase init standard. One thought I
had was that there may end up being platform differences in arguments. We could
end up taking some of these created elements as arguments, for instance, which
might ease testing. But mostly this keeps it out of the client interface, which
I thought was good, but realistically the purest thing is probably to make an
interface for that. I guess what I'm saying is I don't have a strong opinion.
:-)

+
   void UpdateDisk(const DiskInfoMac& info, UpdateType update_type);
 
   virtual bool GetStorageInfoForPath(
@@ -61,6 +65,8 @@ class RemovableDeviceNotificationsMac
   // posted.
   std::map<std::string, DiskInfoMac> disk_info_map_;
 
+  scoped_ptr<chrome::ImageCaptureDeviceManager> image_capture_device_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(RemovableDeviceNotificationsMac);
 };