Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager.

device/media_transfer_protocol/media_transfer_protocol_manager.h

Index: device/media_transfer_protocol/media_transfer_protocol_manager.h
===================================================================
--- device/media_transfer_protocol/media_transfer_protocol_manager.h	(revision 193326)
+++ device/media_transfer_protocol/media_transfer_protocol_manager.h	(working copy)
@@ -132,19 +132,13 @@
                                uint32 file_id,
                                const GetFileInfoCallback& callback) = 0;
 
-  // Creates the global MediaTransferProtocolManager instance.
+  // Creates and return the global MediaTransferProtocolManager instance.

[Greg Billock, 2013/04/10 18:27:25]

returns

[Lei Zhang, 2013/04/11 06:54:04]

Done.

   // On Linux, |loop_proxy| specifies the message loop proxy to process
   // asynchronous operations.
   // On ChromeOS, |loop_proxy| is set to NULL because ChromeOS already has a
   // dedicated message loop proxy.
-  static void Initialize(scoped_refptr<base::MessageLoopProxy> loop_proxy);
-
-  // Destroys the global MediaTransferProtocolManager instance if it exists.
-  static void Shutdown();
-
-  // Returns a pointer to the global MediaTransferProtocolManager instance.
-  // Initialize() should already have been called.
-  static MediaTransferProtocolManager* GetInstance();
+  static MediaTransferProtocolManager* Initialize(
+      scoped_refptr<base::MessageLoopProxy> loop_proxy, bool is_dummy);
 };
 
 }  // namespace device