| Index: components/storage_monitor/storage_monitor_linux.h
|
| diff --git a/components/storage_monitor/storage_monitor_linux.h b/components/storage_monitor/storage_monitor_linux.h
|
| index 05a59f7c5422456ff0d96378b4ef290631eeb503..a007bf9c7a65b301ea810787c95554fd96fddd68 100644
|
| --- a/components/storage_monitor/storage_monitor_linux.h
|
| +++ b/components/storage_monitor/storage_monitor_linux.h
|
| @@ -31,8 +31,6 @@
|
|
|
| namespace storage_monitor {
|
|
|
| -class MediaTransferProtocolDeviceObserverLinux;
|
| -
|
| class StorageMonitorLinux : public StorageMonitor,
|
| public MtabWatcherLinux::Delegate {
|
| public:
|
| @@ -54,9 +52,6 @@ class StorageMonitorLinux : public StorageMonitor,
|
| void SetGetDeviceInfoCallbackForTest(
|
| const GetDeviceInfoCallback& get_device_info_callback);
|
|
|
| - void SetMediaTransferProtocolManagerForTest(
|
| - device::MediaTransferProtocolManager* test_manager);
|
| -
|
| // MtabWatcherLinux::Delegate implementation.
|
| void UpdateMtab(
|
| const MtabWatcherLinux::MountPointDeviceMap& new_mtab) override;
|
| @@ -95,8 +90,6 @@ class StorageMonitorLinux : public StorageMonitor,
|
| StorageInfo* device_info) const override;
|
| void EjectDevice(const std::string& device_id,
|
| base::Callback<void(EjectStatus)> callback) override;
|
| - device::MediaTransferProtocolManager* media_transfer_protocol_manager()
|
| - override;
|
|
|
| // Called when the MtabWatcher has been created.
|
| void OnMtabWatcherCreated(MtabWatcherLinux* watcher);
|
| @@ -130,11 +123,6 @@ class StorageMonitorLinux : public StorageMonitor,
|
| // points.
|
| MountPriorityMap mount_priority_map_;
|
|
|
| - std::unique_ptr<device::MediaTransferProtocolManager>
|
| - media_transfer_protocol_manager_;
|
| - std::unique_ptr<MediaTransferProtocolDeviceObserverLinux>
|
| - media_transfer_protocol_device_observer_;
|
| -
|
| std::unique_ptr<MtabWatcherLinux, MtabWatcherLinuxDeleter> mtab_watcher_;
|
|
|
| base::WeakPtrFactory<StorageMonitorLinux> weak_ptr_factory_;
|
|
|