From fce641aab64da828cf03afd2e07b7b81333655ad Mon Sep 17 00:00:00 2001
From: Robo <hop2deep@gmail.com>
Date: Fri, 26 Feb 2016 15:47:28 +0530
Subject: [PATCH] browser: allow enumeration of media device labels

---
 atom/browser/api/atom_api_web_contents.cc |  7 +++++++
 atom/browser/api/atom_api_web_contents.h  |  4 ++++
 spec/chromium-spec.js                     | 14 ++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 4935adbc75..28893a54a3 100644
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -463,6 +463,13 @@ void WebContents::FindReply(content::WebContents* web_contents,
   }
 }
 
+bool WebContents::CheckMediaAccessPermission(
+    content::WebContents* web_contents,
+    const GURL& security_origin,
+    content::MediaStreamType type) {
+  return true;
+}
+
 void WebContents::RequestMediaAccessPermission(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h
index b4f29090db..a785e1c070 100644
--- a/atom/browser/api/atom_api_web_contents.h
+++ b/atom/browser/api/atom_api_web_contents.h
@@ -202,6 +202,10 @@ class WebContents : public mate::TrackableObject<WebContents>,
                  const gfx::Rect& selection_rect,
                  int active_match_ordinal,
                  bool final_update) override;
+  bool CheckMediaAccessPermission(
+      content::WebContents* web_contents,
+      const GURL& security_origin,
+      content::MediaStreamType type) override;
   void RequestMediaAccessPermission(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js
index e4444f55b1..8477aea776 100644
--- a/spec/chromium-spec.js
+++ b/spec/chromium-spec.js
@@ -87,6 +87,20 @@ describe('chromium feature', function() {
     });
   });
 
+  describe('navigator.mediaDevices', function() {
+    if (process.env.TRAVIS === 'true') {
+      return;
+    }
+
+    it('can return labels of enumerated devices', function(done) {
+      navigator.mediaDevices.enumerateDevices().then((devices) => {
+        const result = devices.some((device) => !!device.label);
+        if (result)
+          done();
+      });
+    });
+  });
+
   describe('navigator.language', function() {
     it('should not be empty', function() {
       assert.notEqual(navigator.language, '');