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";
 
+// TODO(gbillock): Make these take weak pointers and don't have
+// RemovableDeviceNotificationsMac be ref counted.
+
 void GetDiskInfoAndUpdateOnFileThread(
     const scoped_refptr<RemovableDeviceNotificationsMac>& notifications,
     base::mac::ScopedCFTypeRef<CFDictionaryRef> dict,
     RemovableDeviceNotificationsMac::UpdateType update_type) {
   DiskInfoMac info = DiskInfoMac::BuildDiskInfoOnFileThread(dict);
   if (info.device_id().empty())
     return;
 
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
@@ skipping 14 matching lines @@
       FROM_HERE,
       base::Bind(GetDiskInfoAndUpdateOnFileThread,
                  notifications,
                  dict,
                  update_type));
 }
 
 }  // namespace
 
 RemovableDeviceNotificationsMac::RemovableDeviceNotificationsMac() {
+}
+
+RemovableDeviceNotificationsMac::~RemovableDeviceNotificationsMac() {
+  if (session_.get()) {
+    DASessionUnscheduleFromRunLoop(
+        session_, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
+  }
+}
+
+void RemovableDeviceNotificationsMac::Init() {
   session_.reset(DASessionCreate(NULL));
 
-  DASessionScheduleWithRunLoop(
-      session_, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
-
   // Register for callbacks for attached, changed, and removed devices.
   // This will send notifications for existing devices too.
   DARegisterDiskAppearedCallback(
       session_,
       kDADiskDescriptionMatchVolumeMountable,
       DiskAppearedCallback,
       this);
   DARegisterDiskDisappearedCallback(
       session_,
       kDADiskDescriptionMatchVolumeMountable,
       DiskDisappearedCallback,
       this);
   DARegisterDiskDescriptionChangedCallback(
       session_,
       kDADiskDescriptionMatchVolumeMountable,
       kDADiskDescriptionWatchVolumePath,
       DiskDescriptionChangedCallback,
       this);
-}
 
-RemovableDeviceNotificationsMac::~RemovableDeviceNotificationsMac() {
-  DASessionUnscheduleFromRunLoop(
+  DASessionScheduleWithRunLoop(
       session_, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
+
+  if (base::mac::IsOSLionOrLater()) {
+    image_capture_device_manager_.reset(new chrome::ImageCaptureDeviceManager);
+    image_capture_device_manager_->SetNotifications(receiver());
+  }
 }
 
 void RemovableDeviceNotificationsMac::UpdateDisk(
     const DiskInfoMac& info,
     UpdateType update_type) {
   if (info.bsd_name().empty())
     return;
 
   std::map<std::string, DiskInfoMac>::iterator it =
       disk_info_map_.find(info.bsd_name());
@@ skipping 106 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