Storage Monitor: Make StorageMonitorLinux own the MediaTransferProtocolManager.

device/media_transfer_protocol/media_transfer_protocol_manager.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 DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_
 #define DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 114 matching lines @@
   virtual void GetFileInfoByPath(const std::string& storage_handle,
                                  const std::string& path,
                                  const GetFileInfoCallback& callback) = 0;
 
   // Gets the file metadata for |file_id| on |storage_handle| and runs
   // |callback|.
   virtual void GetFileInfoById(const std::string& storage_handle,
                                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
 
 #endif  // DEVICE_MEDIA_TRANSFER_PROTOCOL_MEDIA_TRANSFER_PROTOCOL_MANAGER_H_