Add a receiver interface to RemovableStorageNotifications.

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>
 
@@ skipping 123 matching lines @@
 }  // namespace
 
 namespace chrome {
 
 const int kWorkerPoolNumThreads = 3;
 const char* kWorkerPoolNamePrefix = "DeviceInfoPool";
 
 VolumeMountWatcherWin::VolumeMountWatcherWin()
     : device_info_worker_pool_(new base::SequencedWorkerPool(
           kWorkerPoolNumThreads, kWorkerPoolNamePrefix)),
-      weak_factory_(this) {
+      weak_factory_(this),
+      notifications_(NULL) {
   get_attached_devices_callback_ = base::Bind(&GetAttachedDevices);
   get_device_details_callback_ = base::Bind(&GetDeviceDetails);
 }
 
 // static
 FilePath VolumeMountWatcherWin::DriveNumberToFilePath(int drive_number) {
   if (drive_number < 0 || drive_number > 25)
     return FilePath();
   string16 path(L"_:\\");
   path[0] = L'A' + drive_number;
@@ skipping 139 matching lines @@
           if (!(unitmask & 0x01))
             continue;
           HandleDeviceDetachEventOnUIThread(DriveNumberToFilePath(i).value());
         }
       }
       break;
     }
   }
 }
 
+void VolumeMountWatcherWin::SetNotifications(
+    RemovableStorageNotifications::Receiver* notifications) {
+  notifications_ = notifications;
+}
+
 VolumeMountWatcherWin::~VolumeMountWatcherWin() {
   weak_factory_.InvalidateWeakPtrs();
 }
 
 
 void VolumeMountWatcherWin::HandleDeviceAttachEventOnUIThread(
     const FilePath& device_path,
     const MountPointInfo& info) {
   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;
 
-  RemovableStorageNotifications* notifications =
-      RemovableStorageNotifications::GetInstance();
-  if (notifications) {
-    string16 display_name = GetDisplayNameForDevice(0, info.name);
-    notifications->ProcessAttach(info.device_id, display_name,
-                                 device_path.value());
+  if (notifications_) {
+    string16 display_name = GetDisplayNameForDevice(0, device_name);
+    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;
 
-  RemovableStorageNotifications* notifications =
-      RemovableStorageNotifications::GetInstance();
-  if (notifications)
-    notifications->ProcessDetach(device_info->second.device_id);
+  if (notifications_)
+    notifications_->ProcessDetach(device_info->second.device_id);
   device_metadata_.erase(device_info);
 }
 
 }  // namespace chrome