Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager.

chrome/browser/storage_monitor/storage_monitor.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_STORAGE_MONITOR_STORAGE_MONITOR_H_
 #define CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
 
 class ChromeBrowserMainPartsLinux;
 class ChromeBrowserMainPartsMac;
 class MediaGalleriesPrivateApiTest;
 class MediaGalleriesPrivateEjectApiTest;
 class SystemInfoStorageApiTest;
 
+namespace device {
+class MediaTransferProtocolManager;
+}
+
 namespace chrome {
 
 class MediaFileSystemRegistryTest;
 class RemovableStorageObserver;
 class TransientDeviceIds;
 
 // Base class for platform-specific instances watching for removable storage
 // attachments/detachments.
 // Lifecycle contracts: This class is created by ChromeBrowserMain
 // implementations before the profile is initialized, so listeners can be
@@ skipping 37 matching lines @@
   // On success, returns true and fills in |device_location| with device
   // interface details and |storage_object_id| with the string ID that
   // uniquely identifies the object on the device. This ID need not be
   // persistent across sessions.
   virtual bool GetMTPStorageInfoFromDeviceId(
       const std::string& storage_device_id,
       string16* device_location,
       string16* storage_object_id) const = 0;
 #endif
 
+#if defined(OS_LINUX)
+  virtual device::MediaTransferProtocolManager*

[Lei Zhang, 2013/04/10 04:31:21]

This is not ideal, as discussed in person at some point. Can you remind me what
ideas you had? Put this only in StorageMonitorLinux?

+      media_transfer_protocol_manager() = 0;
+#endif
+
   // Returns information for attached removable storage.
   std::vector<StorageInfo> GetAttachedStorage() const;
 
   void AddObserver(RemovableStorageObserver* obs);
   void RemoveObserver(RemovableStorageObserver* obs);
 
   std::string GetTransientIdForDeviceId(const std::string& device_id);
   std::string GetDeviceIdForTransientId(const std::string& transient_id) const;
 
   virtual void EjectDevice(
@@ skipping 39 matching lines @@
 
   // Map of all the attached removable storage devices.
   RemovableStorageMap storage_map_;
 
   scoped_ptr<TransientDeviceIds> transient_device_ids_;
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_STORAGE_MONITOR_STORAGE_MONITOR_H_