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

content/renderer/media/media_stream_dispatcher.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 38 matching lines @@
 
   // Cancel the request for a new media stream to be created.
   virtual void CancelGenerateStream(
       int request_id,
       const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler);
 
   // Stop a started device that has been requested by calling GenerateStream.
   virtual void StopStreamDevice(const StreamDeviceInfo& device_info);
 
   // Request to enumerate devices.
+  // If |hide_labels_if_no_access| is true, labels will be empty in the
+  // response if permission has not been granted for the device type. This
+  // should normally be true.
   virtual void EnumerateDevices(
       int request_id,
       const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
       MediaStreamType type,
-      const GURL& security_origin);
+      const GURL& security_origin,
+      bool hide_labels_if_no_access);
 
   // Request to stop enumerating devices.
   void StopEnumerateDevices(
       int request_id,
       const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler);
 
   // Request to open a device.
   void OpenDevice(
       int request_id,
       const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
@@ skipping 66 matching lines @@
   // been canceled.
   typedef std::list<Request> RequestList;
   RequestList requests_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_