Replace MessageLoopProxy with SingleThreadTaskRunner for the rest of media/.

chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h"
 
 #include "base/lazy_instance.h"
-#include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner_util.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "content/public/browser/media_device_id.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/common/error_utils.h"
 #include "media/audio/audio_manager_base.h"
@@ skipping 73 matching lines @@
       scoped_ptr<Event> event(
           new Event(kEventName, make_scoped_ptr(new base::ListValue()).Pass()));
       router->DispatchEventToExtension(extension_id, event.Pass());
     }
   }
 }
 
 bool WebrtcAudioPrivateGetSinksFunction::RunImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  AudioManager::Get()->GetMessageLoop()->PostTaskAndReply(
+  AudioManager::Get()->GetTaskRunner()->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&WebrtcAudioPrivateGetSinksFunction::DoQuery, this),
       base::Bind(&WebrtcAudioPrivateGetSinksFunction::DoneOnUIThread, this));
   return true;
 }
 
 void WebrtcAudioPrivateGetSinksFunction::DoQuery() {
-  DCHECK(AudioManager::Get()->GetMessageLoop()->BelongsToCurrentThread());
+  DCHECK(AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread());
 
   AudioDeviceNames device_names;
   AudioManager::Get()->GetAudioOutputDeviceNames(&device_names);
 
   std::vector<linked_ptr<wap::SinkInfo> > results;
   for (AudioDeviceNames::const_iterator it = device_names.begin();
        it != device_names.end();
        ++it) {
     linked_ptr<wap::SinkInfo> info(new wap::SinkInfo);
     info->sink_id = it->unique_id;
@@ skipping 70 matching lines @@
   if (result.empty()) {
     DVLOG(2) << "Received empty ID, replacing with default ID.";
     result = media::AudioManagerBase::kDefaultDeviceId;
   }
   results_.reset(wap::GetActiveSink::Results::Create(result).release());
   SendResponse(true);
 }
 
 WebrtcAudioPrivateSetActiveSinkFunction::
 WebrtcAudioPrivateSetActiveSinkFunction()
-    : message_loop_(base::MessageLoopProxy::current()),
+    : task_runner_(base::MessageLoopProxy::current()),
       tab_id_(0),
       num_remaining_sink_ids_(0) {
 }
 
 WebrtcAudioPrivateSetActiveSinkFunction::
 ~WebrtcAudioPrivateSetActiveSinkFunction() {
 }
 
 bool WebrtcAudioPrivateSetActiveSinkFunction::RunImpl() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 25 matching lines @@
         controllers.begin();
     for (; it != controllers.end(); ++it) {
       (*it)->SwitchOutputDevice(sink_id_, base::Bind(
           &WebrtcAudioPrivateSetActiveSinkFunction::SwitchDone, this));
     }
   }
 }
 
 void WebrtcAudioPrivateSetActiveSinkFunction::SwitchDone() {
   if (--num_remaining_sink_ids_ == 0) {
-    message_loop_->PostTask(
+    task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&WebrtcAudioPrivateSetActiveSinkFunction::DoneOnUIThread,
                    this));
   }
 }
 
 void WebrtcAudioPrivateSetActiveSinkFunction::DoneOnUIThread() {
   SendResponse(true);
 }
 
 WebrtcAudioPrivateGetAssociatedSinkFunction::
 WebrtcAudioPrivateGetAssociatedSinkFunction() {
 }
 
 WebrtcAudioPrivateGetAssociatedSinkFunction::
 ~WebrtcAudioPrivateGetAssociatedSinkFunction() {
 }
 
 bool WebrtcAudioPrivateGetAssociatedSinkFunction::RunImpl() {
   params_ = wap::GetAssociatedSink::Params::Create(*args_);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   EXTENSION_FUNCTION_VALIDATE(params_.get());
 
-  AudioManager::Get()->GetMessageLoop()->PostTaskAndReply(
+  AudioManager::Get()->GetTaskRunner()->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&WebrtcAudioPrivateGetAssociatedSinkFunction::
                  GetDevicesOnDeviceThread, this),
       base::Bind(
           &WebrtcAudioPrivateGetAssociatedSinkFunction::OnGetDevicesDone,
           this));
 
   return true;
 }
 
 void WebrtcAudioPrivateGetAssociatedSinkFunction::GetDevicesOnDeviceThread() {
-  DCHECK(AudioManager::Get()->GetMessageLoop()->BelongsToCurrentThread());
+  DCHECK(AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread());
   AudioManager::Get()->GetAudioInputDeviceNames(&source_devices_);
 }
 
 void WebrtcAudioPrivateGetAssociatedSinkFunction::OnGetDevicesDone() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTaskAndReplyWithResult(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&WebrtcAudioPrivateGetAssociatedSinkFunction::
                  GetRawSourceIDOnIOThread,
@@ skipping 31 matching lines @@
     }
   }
 
   return raw_source_id;
 }
 
 void WebrtcAudioPrivateGetAssociatedSinkFunction::OnGetRawSourceIDDone(
     const std::string& raw_source_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::PostTaskAndReplyWithResult(
-      AudioManager::Get()->GetMessageLoop(),
+      AudioManager::Get()->GetTaskRunner(),
       FROM_HERE,
       base::Bind(&WebrtcAudioPrivateGetAssociatedSinkFunction::
                  GetAssociatedSinkOnDeviceThread,
                  this,
                  raw_source_id),
       base::Bind(&WebrtcAudioPrivateGetAssociatedSinkFunction::
                  OnGetAssociatedSinkDone,
                  this));
 }
 
 std::string
 WebrtcAudioPrivateGetAssociatedSinkFunction::GetAssociatedSinkOnDeviceThread(
     const std::string& raw_source_id) {
-  DCHECK(AudioManager::Get()->GetMessageLoop()->BelongsToCurrentThread());
+  DCHECK(AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread());
 
   // We return an empty string if there is no associated output device.
   std::string result;
   if (!raw_source_id.empty()) {
     result = AudioManager::Get()->GetAssociatedOutputDeviceID(raw_source_id);
   }
 
   return result;
 }
 
 void WebrtcAudioPrivateGetAssociatedSinkFunction::OnGetAssociatedSinkDone(
     const std::string& associated_sink_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   results_.reset(
       wap::GetAssociatedSink::Results::Create(associated_sink_id).release());
   SendResponse(true);
 }
 
 }  // namespace extensions