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

media/blink/webmediaplayer_impl.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 "media/blink/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
@@ skipping 388 matching lines @@
 
 void WebMediaPlayerImpl::setSinkId(const blink::WebString& device_id,
                                    WebSetSinkIdCB* web_callback) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   DVLOG(1) << __FUNCTION__;
   media::SwitchOutputDeviceCB callback =
       media::ConvertToSwitchOutputDeviceCB(web_callback);
   OutputDevice* output_device = audio_source_provider_->GetOutputDevice();
   if (output_device) {
     std::string device_id_str(device_id.utf8());
-    GURL security_origin(frame_->securityOrigin().toString().utf8());
+    url::Origin security_origin(
+        GURL(frame_->securityOrigin().toString().utf8()));
     output_device->SwitchOutputDevice(device_id_str, security_origin, callback);
   } else {
-    callback.Run(SWITCH_OUTPUT_DEVICE_RESULT_ERROR_NOT_SUPPORTED);
+    callback.Run(SWITCH_OUTPUT_DEVICE_RESULT_ERROR_INTERNAL);
   }
 }
 
 #define STATIC_ASSERT_MATCHING_ENUM(webkit_name, chromium_name) \
     static_assert(static_cast<int>(WebMediaPlayer::webkit_name) == \
                   static_cast<int>(BufferedDataSource::chromium_name), \
                   "mismatching enum values: " #webkit_name)
 STATIC_ASSERT_MATCHING_ENUM(PreloadNone, NONE);
 STATIC_ASSERT_MATCHING_ENUM(PreloadMetaData, METADATA);
 STATIC_ASSERT_MATCHING_ENUM(PreloadAuto, AUTO);
@@ skipping 640 matching lines @@
 
   // pause() may be called after playback has ended and the HTMLMediaElement
   // requires that currentTime() == duration() after ending.  We want to ensure
   // |paused_time_| matches currentTime() in this case or a future seek() may
   // incorrectly discard what it thinks is a seek to the existing time.
   paused_time_ =
       ended_ ? pipeline_.GetMediaDuration() : pipeline_.GetMediaTime();
 }
 
 }  // namespace media