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

media/blink/webmediaplayer_util.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_util.h"
 
 #include <math.h>
+#include <string>
 
 #include "base/metrics/histogram.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/media_client.h"
 #include "media/base/media_keys.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.h"
 
 namespace media {
 
 // Compile asserts shared by all platforms.
@@ skipping 200 matching lines @@
       break;
     case SWITCH_OUTPUT_DEVICE_RESULT_ERROR_NOT_FOUND:
       callback.web_callback_->onError(new blink::WebSetSinkIdError(
           blink::WebSetSinkIdError::ErrorTypeNotFound, "Device not found"));
       break;
     case SWITCH_OUTPUT_DEVICE_RESULT_ERROR_NOT_AUTHORIZED:
       callback.web_callback_->onError(new blink::WebSetSinkIdError(
           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();
   }
 
   callback.web_callback_ = nullptr;
 }
 
 }  // namespace
 
 SwitchOutputDeviceCB ConvertToSwitchOutputDeviceCB(
     WebSetSinkIdCB* web_callbacks) {
   return media::BindToCurrentLoop(
       base::Bind(RunSetSinkIdCallback, SetSinkIdCallback(web_callbacks)));
 }
 
 }  // namespace media