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

base/system_monitor/system_monitor.h

Index: base/system_monitor/system_monitor.h
diff --git a/base/system_monitor/system_monitor.h b/base/system_monitor/system_monitor.h
index ea95da89ccbe9fb6635b8ae905b6415ac977ca24..0f63bc22aab0f4858ad7116b80af8372a39299ea 100644
--- a/base/system_monitor/system_monitor.h
+++ b/base/system_monitor/system_monitor.h
@@ -59,22 +59,6 @@ class BASE_EXPORT SystemMonitor {
     DEVTYPE_UNKNOWN,  // Other devices.
   };
 
-  struct BASE_EXPORT RemovableStorageInfo {
-    RemovableStorageInfo();
-    RemovableStorageInfo(const std::string& id,
-                         const string16& device_name,
-                         const FilePath::StringType& device_location);
-
-    // Unique device id - persists between device attachments.
-    std::string device_id;
-
-    // Human readable removable storage device name.
-    string16 name;
-
-    // Current attached removable storage device location.
-    FilePath::StringType location;
-  };
-
   // Create SystemMonitor. Only one SystemMonitor instance per application
   // is allowed.
   SystemMonitor();
@@ -95,9 +79,6 @@ class BASE_EXPORT SystemMonitor {
 #endif  // OS_IOS
 #endif  // OS_MACOSX
 
-  // Returns information for attached removable storage.
-  std::vector<RemovableStorageInfo> GetAttachedRemovableStorage() const;
-
   //
   // Power-related APIs
   //
@@ -136,14 +117,6 @@ class BASE_EXPORT SystemMonitor {
     // This is only implemented on Windows currently.
     virtual void OnDevicesChanged(DeviceType device_type) {}
 
-    // When a removable storage device is attached or detached, one of these
-    // two events is triggered.
-    virtual void OnRemovableStorageAttached(
-        const std::string& id,
-        const string16& name,
-        const FilePath::StringType& location) {}
-    virtual void OnRemovableStorageDetached(const std::string& id) {}
-
    protected:
     virtual ~DevicesChangedObserver() {}
   };
@@ -176,15 +149,8 @@ class BASE_EXPORT SystemMonitor {
 
   // Cross-platform handling of a device change event.
   void ProcessDevicesChanged(DeviceType device_type);
-  void ProcessRemovableStorageAttached(const std::string& id,
-                                       const string16& name,
-                                       const FilePath::StringType& location);
-  void ProcessRemovableStorageDetached(const std::string& id);
 
  private:
-  // Mapping of unique device id to device info tuple.
-  typedef std::map<std::string, RemovableStorageInfo> RemovableStorageMap;
-
 #if defined(OS_MACOSX)
   void PlatformInit();
   void PlatformDestroy();
@@ -201,10 +167,6 @@ class BASE_EXPORT SystemMonitor {
 
   // Functions to trigger notifications.
   void NotifyDevicesChanged(DeviceType device_type);
-  void NotifyRemovableStorageAttached(const std::string& id,
-                                      const string16& name,
-                                      const FilePath::StringType& location);
-  void NotifyRemovableStorageDetached(const std::string& id);
   void NotifyPowerStateChange();
   void NotifySuspend();
   void NotifyResume();
@@ -224,11 +186,6 @@ class BASE_EXPORT SystemMonitor {
   std::vector<id> notification_observers_;
 #endif
 
-  // For manipulating removable_storage_map_ structure.
-  mutable base::Lock removable_storage_lock_;
-  // Map of all the attached removable storage devices.
-  RemovableStorageMap removable_storage_map_;
-
   DISALLOW_COPY_AND_ASSIGN(SystemMonitor);
 };