From 56a16915884868fc39d5d3ca0696ec15c4680078 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Sun, 8 Mar 2015 20:04:25 -0700
Subject: [PATCH] MEDIA_LOOPBACK_AUDIO_CAPTURE renamed to
 MEDIA_DESKTOP_AUDIO_CAPTURE

---
 .../browser/media/media_stream_devices_controller.cc | 12 ++++++------
 .../browser/media/media_stream_devices_controller.h  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/brightray/browser/media/media_stream_devices_controller.cc b/brightray/browser/media/media_stream_devices_controller.cc
index b55e73844f9b..3d4f4cc3328c 100644
--- a/brightray/browser/media/media_stream_devices_controller.cc
+++ b/brightray/browser/media/media_stream_devices_controller.cc
@@ -51,7 +51,7 @@ bool MediaStreamDevicesController::TakeAction() {
   // Do special handling of desktop screen cast.
   if (request_.audio_type == content::MEDIA_TAB_AUDIO_CAPTURE ||
       request_.video_type == content::MEDIA_TAB_VIDEO_CAPTURE ||
-      request_.audio_type == content::MEDIA_LOOPBACK_AUDIO_CAPTURE ||
+      request_.audio_type == content::MEDIA_DESKTOP_AUDIO_CAPTURE ||
       request_.video_type == content::MEDIA_DESKTOP_VIDEO_CAPTURE) {
     HandleUserMediaRequest();
     return true;
@@ -59,7 +59,7 @@ bool MediaStreamDevicesController::TakeAction() {
 
   // Deny the request if there is no device attached to the OS.
   if (!HasAnyAvailableDevice()) {
-    Deny();
+    Deny(content::MEDIA_DEVICE_NO_HARDWARE);
     return true;
   }
 
@@ -149,11 +149,11 @@ void MediaStreamDevicesController::Accept() {
   cb.Run(devices, content::MEDIA_DEVICE_OK, scoped_ptr<content::MediaStreamUI>());
 }
 
-void MediaStreamDevicesController::Deny() {
+void MediaStreamDevicesController::Deny(content::MediaStreamRequestResult result) {
   content::MediaResponseCallback cb = callback_;
   callback_.Reset();
   cb.Run(content::MediaStreamDevices(),
-         content::MEDIA_DEVICE_PERMISSION_DENIED,
+         result,
          scoped_ptr<content::MediaStreamUI>());
 }
 
@@ -168,9 +168,9 @@ void MediaStreamDevicesController::HandleUserMediaRequest() {
     devices.push_back(content::MediaStreamDevice(
         content::MEDIA_TAB_VIDEO_CAPTURE, "", ""));
   }
-  if (request_.audio_type == content::MEDIA_LOOPBACK_AUDIO_CAPTURE) {
+  if (request_.audio_type == content::MEDIA_DESKTOP_AUDIO_CAPTURE) {
     devices.push_back(content::MediaStreamDevice(
-        content::MEDIA_LOOPBACK_AUDIO_CAPTURE, "loopback", "System Audio"));
+        content::MEDIA_DESKTOP_AUDIO_CAPTURE, "loopback", "System Audio"));
   }
   if (request_.video_type == content::MEDIA_DESKTOP_VIDEO_CAPTURE) {
     content::DesktopMediaID screen_id;
diff --git a/brightray/browser/media/media_stream_devices_controller.h b/brightray/browser/media/media_stream_devices_controller.h
index e77af4770271..47aacfb66b64 100644
--- a/brightray/browser/media/media_stream_devices_controller.h
+++ b/brightray/browser/media/media_stream_devices_controller.h
@@ -23,7 +23,7 @@ class MediaStreamDevicesController {
 
   // Explicitly accept or deny the request.
   void Accept();
-  void Deny();
+  void Deny(content::MediaStreamRequestResult result);
 
  private:
   // Handle the request of desktop or tab screen cast.