Regularize ownerships and lifecycle for storage monitor platform classes.

chrome/browser/storage_monitor/removable_device_notifications_mac.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_STORAGE_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_MAC_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_MAC_H_
 
 #include <DiskArbitration/DiskArbitration.h>
 #include <map>
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/storage_monitor/disk_info_mac.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 
 namespace chrome {
 
+class ImageCaptureDeviceManager;
+
 // This class posts notifications to listeners when a new disk
 // is attached, removed, or changed.
 class RemovableDeviceNotificationsMac
     : public StorageMonitor,
       public base::RefCountedThreadSafe<RemovableDeviceNotificationsMac> {
  public:
   enum UpdateType {
     UPDATE_DEVICE_ADDED,
     UPDATE_DEVICE_CHANGED,
     UPDATE_DEVICE_REMOVED,
   };
 
   // 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(
       const base::FilePath& path,
       StorageInfo* device_info) const OVERRIDE;
 
   // Returns the storage size of the device present at |location|. If the
   // device information is unavailable, returns zero. |location| must be a
   // top-level mount point.
   virtual uint64 GetStorageSize(const std::string& location) const OVERRIDE;
@@ skipping 11 matching lines @@
   bool ShouldPostNotificationForDisk(const DiskInfoMac& info) const;
   bool FindDiskWithMountPoint(const base::FilePath& mount_point,
                               DiskInfoMac* info) const;
 
   base::mac::ScopedCFTypeRef<DASessionRef> session_;
   // Maps disk bsd names to disk info objects. This map tracks all mountable
   // devices on the system though only notifications for removable devices are
   // posted.
   std::map<std::string, DiskInfoMac> disk_info_map_;
 
+  scoped_ptr<chrome::ImageCaptureDeviceManager> image_capture_device_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(RemovableDeviceNotificationsMac);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_REMOVABLE_DEVICE_NOTIFICATIONS_MAC_H_