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

media/blink/webmediaplayer_util.cc

Index: media/blink/webmediaplayer_util.cc
diff --git a/media/blink/webmediaplayer_util.cc b/media/blink/webmediaplayer_util.cc
index 96de408bbcf64412f31bd95aa10580a9817cd540..15707de5c4c0f0a25dbc76e728829132ded5065d 100644
--- a/media/blink/webmediaplayer_util.cc
+++ b/media/blink/webmediaplayer_util.cc
@@ -5,6 +5,7 @@
 #include "media/blink/webmediaplayer_util.h"
 
 #include <math.h>
+#include <string>
 
 #include "base/metrics/histogram.h"
 #include "media/base/bind_to_current_loop.h"
@@ -225,15 +226,10 @@ void RunSetSinkIdCallback(const SetSinkIdCallback& callback,
           blink::WebSetSinkIdError::ErrorTypeSecurity,
           "No permission to access device"));
       break;
-    case SWITCH_OUTPUT_DEVICE_RESULT_ERROR_OBSOLETE:
+    case SWITCH_OUTPUT_DEVICE_RESULT_ERROR_INTERNAL:
       callback.web_callback_->onError(new blink::WebSetSinkIdError(
           blink::WebSetSinkIdError::ErrorTypeAbort,
-          "The requested operation became obsolete and was aborted"));
-      break;
-    case SWITCH_OUTPUT_DEVICE_RESULT_ERROR_NOT_SUPPORTED:
-      callback.web_callback_->onError(new blink::WebSetSinkIdError(
-          blink::WebSetSinkIdError::ErrorTypeAbort,
-          "The requested operation cannot be performed and was aborted"));
+          "The requested operation could be performed and was aborted"));
       break;
     default:
       NOTREACHED();