[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 {
@@ skipping 80 matching lines @@
   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 74 matching lines @@
   return false;
 }
 
 // static
 RemovableStorageNotifications* RemovableStorageNotifications::GetInstance() {
   DCHECK(g_removable_device_notifications_mac != NULL);
   return g_removable_device_notifications_mac;
 }
 
 }  // namespace chrome