Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

content/renderer/media/webmediaplayer_ms.cc

Index: content/renderer/media/webmediaplayer_ms.cc
diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc
index dca8fce954fb98e12aae2a28b51567b6866dfa2e..c5174b5c7dbb71fc2ba1b757ac436b38d3fba7d2 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -233,11 +233,11 @@ void WebMediaPlayerMS::setSinkId(
     blink::WebSetSinkIdCallbacks* web_callback) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
-  const media::SwitchOutputDeviceCB callback =
-      media::ConvertToSwitchOutputDeviceCB(web_callback);
-  if (audio_renderer_ && audio_renderer_->GetOutputDevice()) {
-    audio_renderer_->GetOutputDevice()->SwitchOutputDevice(
-        sink_id.utf8(), security_origin, callback);
+  const media::OutputDeviceStatusCB callback =
+      media::ConvertToOutputDeviceStatusCB(web_callback);
+  if (audio_renderer_) {
+    audio_renderer_->SwitchOutputDevice(sink_id.utf8(), security_origin,
+                                        callback);
   } else {
     callback.Run(media::OUTPUT_DEVICE_STATUS_ERROR_INTERNAL);
   }