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

chrome/browser/system_monitor/volume_mount_watcher_win.cc

 // 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/volume_mount_watcher_win.h"
 
 #include <windows.h>
 #include <dbt.h>
 #include <fileapi.h>
 
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/system_monitor/media_device_notifications_utils.h"
 #include "chrome/browser/system_monitor/media_storage_util.h"
+#include "chrome/browser/system_monitor/removable_storage_notifications.h"
 #include "content/public/browser/browser_thread.h"
 
-using base::SystemMonitor;
 using content::BrowserThread;
 
 namespace {
 
 const DWORD kMaxPathBufLen = MAX_PATH + 1;
 
 bool IsRemovable(const string16& mount_point) {
   if (GetDriveType(mount_point.c_str()) != DRIVE_REMOVABLE)
     return false;
 
@@ skipping 282 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   device_metadata_[device_path.value()] = info;
 
   DeviceCheckComplete(device_path);
 
   // Don't call removable storage observers for fixed volumes.
   if (!info.removable)
     return;
 
-  SystemMonitor* monitor = SystemMonitor::Get();
-  if (monitor) {
+  RemovableStorageNotifications* notifications =
+      RemovableStorageNotifications::GetInstance();
+  if (notifications) {
     string16 display_name = GetDisplayNameForDevice(0, info.name);
-    monitor->ProcessRemovableStorageAttached(info.device_id, display_name,
-                                             device_path.value());
+    notifications->ProcessAttach(info.device_id, display_name,
+                                 device_path.value());
   }
 }
 
 void VolumeMountWatcherWin::HandleDeviceDetachEventOnUIThread(
     const string16& device_location) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   MountPointDeviceMetadataMap::const_iterator device_info =
       device_metadata_.find(device_location);
   // If the device isn't type removable (like a CD), it won't be there.
   if (device_info == device_metadata_.end())
     return;
 
-  SystemMonitor* monitor = SystemMonitor::Get();
-  if (monitor)
-    monitor->ProcessRemovableStorageDetached(device_info->second.device_id);
+  RemovableStorageNotifications* notifications =
+      RemovableStorageNotifications::GetInstance();
+  if (notifications)
+    notifications->ProcessDetach(device_info->second.device_id);
   device_metadata_.erase(device_info);
 }
 
 }  // namespace chrome