Change MediaTransferProtocolManager::Initialize to use a TaskRunner instead of a MessageLoopProxy.

Review URL: https://chromiumcodereview.appspot.com/13983018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195708 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 13 deletions

diff --git a/device/media_transfer_protocol/media_transfer_protocol_manager.cc b/device/media_transfer_protocol/media_transfer_protocol_manager.cc
index 37cc5ed..70871bd 100644
--- a/device/media_transfer_protocol/media_transfer_protocol_manager.cc
+++ b/device/media_transfer_protocol/media_transfer_protocol_manager.cc
@@ -12,8 +12,8 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/weak_ptr.h"
-#include "base/message_loop_proxy.h"
 #include "base/observer_list.h"
+#include "base/sequenced_task_runner.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_checker.h"
 #include "device/media_transfer_protocol/media_transfer_protocol_daemon_client.h"
@@ -36,22 +36,22 @@ MediaTransferProtocolManager* g_media_transfer_protocol_manager = NULL;
 class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
  public:
   explicit MediaTransferProtocolManagerImpl(
-      scoped_refptr<base::MessageLoopProxy> loop_proxy)
+      scoped_refptr<base::SequencedTaskRunner> task_runner)
       : weak_ptr_factory_(this) {
     dbus::Bus* bus = NULL;
 #if defined(OS_CHROMEOS)
-    DCHECK(!loop_proxy.get());
+    DCHECK(!task_runner.get());
     chromeos::DBusThreadManager* dbus_thread_manager =
         chromeos::DBusThreadManager::Get();
     bus = dbus_thread_manager->GetSystemBus();
     if (!bus)
       return;
 #else
-    DCHECK(loop_proxy.get());
+    DCHECK(task_runner.get());
     dbus::Bus::Options options;
     options.bus_type = dbus::Bus::SYSTEM;
     options.connection_type = dbus::Bus::PRIVATE;
-    options.dbus_task_runner = loop_proxy;
+    options.dbus_task_runner = task_runner;
     session_bus_ = new dbus::Bus(options);
     bus = session_bus_.get();
 #endif
@@ -438,11 +438,11 @@ class MediaTransferProtocolManagerImpl : public MediaTransferProtocolManager {
 
 // static
 MediaTransferProtocolManager* MediaTransferProtocolManager::Initialize(
-    scoped_refptr<base::MessageLoopProxy> loop_proxy) {
+    scoped_refptr<base::SequencedTaskRunner> task_runner) {
   DCHECK(!g_media_transfer_protocol_manager);
 
   g_media_transfer_protocol_manager =
-      new MediaTransferProtocolManagerImpl(loop_proxy);
+      new MediaTransferProtocolManagerImpl(task_runner);
   VLOG(1) << "MediaTransferProtocolManager initialized";
 
   return g_media_transfer_protocol_manager;
diff --git a/device/media_transfer_protocol/media_transfer_protocol_manager.h b/device/media_transfer_protocol/media_transfer_protocol_manager.h
index 4b14e87..29d5fd5 100644
--- a/device/media_transfer_protocol/media_transfer_protocol_manager.h
+++ b/device/media_transfer_protocol/media_transfer_protocol_manager.h
@@ -20,7 +20,7 @@ class MtpFileEntry;
 class MtpStorageInfo;
 
 namespace base {
-class MessageLoopProxy;
+class SequencedTaskRunner;
 }
 
 namespace device {
@@ -133,12 +133,12 @@ class MediaTransferProtocolManager {
                                const GetFileInfoCallback& callback) = 0;
 
   // Creates and returns the global MediaTransferProtocolManager instance.
-  // 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.
+  // On Linux, |task_runner| specifies the task runner to process asynchronous
+  // operations.
+  // On ChromeOS, |task_runner| should just be set to NULL because ChromeOS
+  // already has a dedicated message loop proxy.
   static MediaTransferProtocolManager* Initialize(
-      scoped_refptr<base::MessageLoopProxy> loop_proxy);
+      scoped_refptr<base::SequencedTaskRunner> task_runner);
 };
 
 }  // namespace device