Add flag in device enumeration request to control label clearing and don't clear for pepper.

content/browser/renderer_host/media/media_stream_dispatcher_host.cc

Index: content/browser/renderer_host/media/media_stream_dispatcher_host.cc
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
index 36f6794ccead4771c475e406c7a645b8c194389d..2124ed97e7f731a4e931ba27099e79cdae40b2e6 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
@@ -170,7 +170,8 @@ void MediaStreamDispatcherHost::OnEnumerateDevices(
     int render_view_id,
     int page_request_id,
     MediaStreamType type,
-    const GURL& security_origin) {
+    const GURL& security_origin,
+    bool hide_labels_if_no_access) {
   DVLOG(1) << "MediaStreamDispatcherHost::OnEnumerateDevices("
            << render_view_id << ", "
            << page_request_id << ", "
@@ -183,10 +184,14 @@ void MediaStreamDispatcherHost::OnEnumerateDevices(
   DCHECK(type == MEDIA_DEVICE_AUDIO_CAPTURE ||
          type == MEDIA_DEVICE_VIDEO_CAPTURE ||
          type == MEDIA_DEVICE_AUDIO_OUTPUT);
-  bool have_permission =
-      type == MEDIA_DEVICE_AUDIO_CAPTURE || type == MEDIA_DEVICE_AUDIO_OUTPUT ?
-          resource_context_->AllowMicAccess(security_origin) :
-          resource_context_->AllowCameraAccess(security_origin);
+  bool have_permission = true;
+  if (hide_labels_if_no_access) {
+    bool audio_type = type == MEDIA_DEVICE_AUDIO_CAPTURE ||
+                      type == MEDIA_DEVICE_AUDIO_OUTPUT;
+    have_permission = audio_type ?
+        resource_context_->AllowMicAccess(security_origin) :
+        resource_context_->AllowCameraAccess(security_origin);
+  }
 
   media_stream_manager_->EnumerateDevices(
       this, render_process_id_, render_view_id, salt_callback_,