From 3a71958e16b16db9c648cea97f351be3aef0a96e Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Thu, 26 Jun 2014 16:31:55 -0400
Subject: [PATCH] Update MediaStreamDevicesController for Chrome 35

See https://codereview.chromium.org/180633008
---
 brightray/browser/media/media_stream_devices_controller.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/brightray/browser/media/media_stream_devices_controller.cc b/brightray/browser/media/media_stream_devices_controller.cc
index a85c1c928d..4fd9894eca 100644
--- a/brightray/browser/media/media_stream_devices_controller.cc
+++ b/brightray/browser/media/media_stream_devices_controller.cc
@@ -41,6 +41,7 @@ MediaStreamDevicesController::MediaStreamDevicesController(
 MediaStreamDevicesController::~MediaStreamDevicesController() {
   if (!callback_.is_null()) {
     callback_.Run(content::MediaStreamDevices(),
+                  content::MEDIA_DEVICE_INVALID_STATE,
                   scoped_ptr<content::MediaStreamUI>());
   }
 }
@@ -150,13 +151,13 @@ void MediaStreamDevicesController::Accept() {
 
   content::MediaResponseCallback cb = callback_;
   callback_.Reset();
-  cb.Run(devices, scoped_ptr<content::MediaStreamUI>());
+  cb.Run(devices, content::MEDIA_DEVICE_OK, scoped_ptr<content::MediaStreamUI>());
 }
 
 void MediaStreamDevicesController::Deny() {
   content::MediaResponseCallback cb = callback_;
   callback_.Reset();
-  cb.Run(content::MediaStreamDevices(), scoped_ptr<content::MediaStreamUI>());
+  cb.Run(content::MediaStreamDevices(), content::MEDIA_DEVICE_PERMISSION_DENIED, scoped_ptr<content::MediaStreamUI>());
 }
 
 }  // namespace brightray