Regularize ownerships and lifecycle for storage monitor platform classes.

chrome/browser/storage_monitor/removable_device_notifications_mac.mm

 // 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.
 
 #include "chrome/browser/storage_monitor/removable_device_notifications_mac.h"
 
+#include "base/mac/mac_util.h"
+#include "chrome/browser/storage_monitor/image_capture_device_manager.h"
 #include "chrome/browser/storage_monitor/media_device_notifications_utils.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chrome {
 
 namespace {
 
 const char kDiskImageModelName[] = "Disk Image";
 
 void GetDiskInfoAndUpdateOnFileThread(
@@ skipping 46 matching lines @@
       session_,
       kDADiskDescriptionMatchVolumeMountable,
       DiskDisappearedCallback,
       this);
   DARegisterDiskDescriptionChangedCallback(
       session_,
       kDADiskDescriptionMatchVolumeMountable,
       kDADiskDescriptionWatchVolumePath,
       DiskDescriptionChangedCallback,
       this);
+
+  if (base::mac::IsOSLionOrLater()) {
+    image_capture_device_manager_.reset(new chrome::ImageCaptureDeviceManager);
+    image_capture_device_manager_->SetNotifications(receiver());
+  }
 }
 
 RemovableDeviceNotificationsMac::~RemovableDeviceNotificationsMac() {
   DASessionUnscheduleFromRunLoop(
       session_, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
 }
 
 void RemovableDeviceNotificationsMac::UpdateDisk(
     const DiskInfoMac& info,
     UpdateType update_type) {
@@ skipping 111 matching lines @@
       it = disk_info_map_.begin(); it != disk_info_map_.end(); ++it) {
     if (it->second.mount_point() == mount_point) {
       *info = it->second;
       return true;
     }
   }
   return false;
 }
 
 }  // namespace chrome