Allow AudioOutputDevice objects to be initialized with a specific hardware output device and store …

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 fe89d6f618235770b306d8a2f2a8640ce036c567..ab7dd718b9c5a0628a94fa80e8d110b8567fd9ba 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -5,6 +5,7 @@
 #include "content/renderer/media/webmediaplayer_ms.h"
 
 #include <limits>
+#include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ -259,13 +260,14 @@ void WebMediaPlayerMS::setSinkId(const blink::WebString& device_id,
     media::OutputDevice* output_device = audio_renderer_->GetOutputDevice();
     if (output_device) {
       const std::string device_id_str(device_id.utf8());
-      const GURL security_origin(frame_->securityOrigin().toString().utf8());
+      const url::Origin security_origin(
+          GURL(frame_->securityOrigin().toString().utf8()));
       output_device->SwitchOutputDevice(device_id_str, security_origin,
                                         callback);
       return;
     }
   }
-  callback.Run(media::SWITCH_OUTPUT_DEVICE_RESULT_ERROR_NOT_SUPPORTED);
+  callback.Run(media::SWITCH_OUTPUT_DEVICE_RESULT_ERROR_INTERNAL);
 }
 
 void WebMediaPlayerMS::setPreload(WebMediaPlayer::Preload preload) {