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

content/renderer/media/webmediaplayer_ms.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 "content/renderer/media/webmediaplayer_ms.h"
 
 #include <limits>
+#include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "cc/blink/context_provider_web_context.h"
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/video_frame_provider_client_impl.h"
 #include "cc/layers/video_layer.h"
 #include "content/public/renderer/media_stream_audio_renderer.h"
@@ skipping 234 matching lines @@
 void WebMediaPlayerMS::setSinkId(const blink::WebString& device_id,
                                  media::WebSetSinkIdCB* web_callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DVLOG(1) << __FUNCTION__;
   media::SwitchOutputDeviceCB callback =
       media::ConvertToSwitchOutputDeviceCB(web_callback);
   if (audio_renderer_.get()) {
     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) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 bool WebMediaPlayerMS::hasVideo() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return (video_frame_provider_.get() != NULL);
 }
@@ skipping 362 matching lines @@
 }
 
 unsigned WebMediaPlayerMS::Compositor::GetTotalFrameCount() {
   return total_frame_count_;
 }
 
 unsigned WebMediaPlayerMS::Compositor::GetDroppedFrameCount() {
   return dropped_frame_count_;
 }
 }  // namespace content