[Media Galleries] Move RemovableStorageInfo notifications to chrome namespace (part 2)

chrome/browser/system_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/system_monitor/removable_device_notifications_mac.h"
 
 #include "chrome/browser/system_monitor/media_device_notifications_utils.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chrome {
 
 namespace {
 
 const char kDiskImageModelName[] = "Disk Image";
 
-static RemovableDeviceNotificationsMac*
-    g_removable_device_notifications_mac = NULL;
-
 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 15 matching lines @@
       base::Bind(GetDiskInfoAndUpdateOnFileThread,
                  notifications,
                  dict,
                  update_type));
 }
 
 }  // namespace
 
 RemovableDeviceNotificationsMac::RemovableDeviceNotificationsMac() {
   session_.reset(DASessionCreate(NULL));
-  DCHECK(!g_removable_device_notifications_mac);
-  g_removable_device_notifications_mac = this;
 
   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() {
-  DCHECK_EQ(this, g_removable_device_notifications_mac);
-  g_removable_device_notifications_mac = NULL;
-
   DASessionUnscheduleFromRunLoop(
       session_, CFRunLoopGetCurrent(), kCFRunLoopCommonModes);
 }
 
 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());
   if (it != disk_info_map_.end()) {
     // If an attached notification was previously posted then post a detached
     // notification now. This is used for devices that are being removed or
     // devices that have changed.
     if (ShouldPostNotificationForDisk(it->second)) {
-      base::SystemMonitor::Get()->ProcessRemovableStorageDetached(
-          it->second.device_id());
+      ProcessDetach(it->second.device_id());
     }
   }
 
   if (update_type == UPDATE_DEVICE_REMOVED) {
     if (it != disk_info_map_.end())
       disk_info_map_.erase(it);
   } else {
     disk_info_map_[info.bsd_name()] = info;
     MediaStorageUtil::RecordDeviceInfoHistogram(true, info.device_id(),
                                                 info.device_name());
     if (ShouldPostNotificationForDisk(info)) {
       string16 display_name = GetDisplayNameForDevice(
           info.total_size_in_bytes(), info.device_name());
-      base::SystemMonitor::Get()->ProcessRemovableStorageAttached(
-          info.device_id(), display_name, info.mount_point().value());
+      ProcessAttach(info.device_id(), display_name, info.mount_point().value());
     }
   }
 }
 
 bool RemovableDeviceNotificationsMac::GetDeviceInfoForPath(
     const FilePath& path,
-    base::SystemMonitor::RemovableStorageInfo* device_info) const {
+    StorageInfo* device_info) const {
   if (!path.IsAbsolute())
     return false;
 
   FilePath current = path;
   const FilePath root(FilePath::kSeparators);
   while (current != root) {
     DiskInfoMac info;
     if (FindDiskWithMountPoint(current, &info)) {
       device_info->device_id = info.device_id();
       device_info->name = info.device_name();
@@ skipping 67 matching lines @@
   for (std::map<std::string, DiskInfoMac>::const_iterator
       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;
 }
 
-// static
-RemovableStorageNotifications* RemovableStorageNotifications::GetInstance() {
-  DCHECK(g_removable_device_notifications_mac != NULL);
-  return g_removable_device_notifications_mac;
-}
-
 }  // namespace chrome