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

chrome/browser/system_monitor/portable_device_watcher_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYSTEM_MONITOR_PORTABLE_DEVICE_WATCHER_WIN_H_
 #define CHROME_BROWSER_SYSTEM_MONITOR_PORTABLE_DEVICE_WATCHER_WIN_H_
 
 #include <portabledeviceapi.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
-#include "base/system_monitor/system_monitor.h"
+#include "chrome/browser/system_monitor/removable_storage_notifications.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 class FilePath;
 
 namespace chrome {
 
 namespace test {
 class TestPortableDeviceWatcherWin;
 }
 
 // This class watches the portable device mount points and sends notifications
-// to base::SystemMonitor about the attached/detached media transfer protocol
-// (MTP) devices. This is a singleton class instantiated by
+// about the attached/detached media transfer protocol (MTP) devices.
+// This is a singleton class instantiated by
 // RemovableDeviceNotificationsWindowWin. This class is created, destroyed and
 // operates on the UI thread, except for long running tasks it spins off to a
 // SequencedTaskRunner.
 class PortableDeviceWatcherWin {
  public:
   typedef std::vector<string16> StorageObjectIDs;
 
   struct DeviceStorageObject {
     DeviceStorageObject(const string16& temporary_id,
                         const std::string& persistent_id);
@@ skipping 16 matching lines @@
     string16 name;
 
     // Device interface path.
     string16 location;
 
     // Device storage details. A device can have multiple data partitions.
     StorageObjects storage_objects;
   };
   typedef std::vector<DeviceDetails> Devices;
 
+  // TODO(gbillock): Change to take the device notifications object as
+  // an argument.
   PortableDeviceWatcherWin();
   virtual ~PortableDeviceWatcherWin();
 
   // Must be called after the browser blocking pool is ready for use.
   // RemovableDeviceNotificationsWindowsWin::Init() will call this function.
   void Init(HWND hwnd);
 
   // Processes DEV_BROADCAST_DEVICEINTERFACE messages and triggers a
-  // SystemMonitor notification if appropriate.
+  // notification if appropriate.
   void OnWindowMessage(UINT event_type, LPARAM data);
 
   // Gets the information of the MTP storage specified by |storage_device_id|.
   // On success, returns true and fills in |device_location| with device
   // interface details and |storage_object_id| with storage object temporary
   // identifier.
   bool GetMTPStorageInfoFromDeviceId(const std::string& storage_device_id,
                                      string16* device_location,
                                      string16* storage_object_id);
 
  private:
   friend class test::TestPortableDeviceWatcherWin;
 
   // Key: MTP device storage unique id.
   // Value: Metadata for the given storage.
-  typedef std::map<std::string, base::SystemMonitor::RemovableStorageInfo>
+  typedef std::map<std::string, RemovableStorageNotifications::StorageInfo>
       MTPStorageMap;
 
   // Key: MTP device plug and play ID string.
   // Value: Vector of device storage objects.
   typedef std::map<string16, StorageObjects> MTPDeviceMap;
 
   // Helpers to enumerate existing MTP storage devices.
   virtual void EnumerateAttachedDevices();
   void OnDidEnumerateAttachedDevices(const Devices* devices,
                                      const bool result);
@@ skipping 21 matching lines @@
 
   // Used by |media_task_runner_| to create cancelable callbacks.
   base::WeakPtrFactory<PortableDeviceWatcherWin> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PortableDeviceWatcherWin);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_SYSTEM_MONITOR_PORTABLE_DEVICE_WATCHER_WIN_H_