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

content/renderer/media/media_stream_impl.cc

 // 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.
 
 #include "content/renderer/media/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/hash.h"
 #include "base/logging.h"
@@ skipping 210 matching lines @@
   media_devices_requests_.push_back(new MediaDevicesRequestInfo(
       media_devices_request,
       audio_input_request_id,
       video_input_request_id,
       audio_output_request_id));
 
   media_stream_dispatcher_->EnumerateDevices(
       audio_input_request_id,
       AsWeakPtr(),
       MEDIA_DEVICE_AUDIO_CAPTURE,
-      security_origin);
+      security_origin,
+      true);
 
   media_stream_dispatcher_->EnumerateDevices(
       video_input_request_id,
       AsWeakPtr(),
       MEDIA_DEVICE_VIDEO_CAPTURE,
-      security_origin);
+      security_origin,
+      true);
 
   media_stream_dispatcher_->EnumerateDevices(
       audio_output_request_id,
       AsWeakPtr(),
       MEDIA_DEVICE_AUDIO_OUTPUT,
-      security_origin);
+      security_origin,
+      true);
 }
 
 void MediaStreamImpl::cancelMediaDevicesRequest(
     const blink::WebMediaDevicesRequest& media_devices_request) {
   DCHECK(CalledOnValidThread());
   MediaDevicesRequestInfo* request =
       FindMediaDevicesRequestInfo(media_devices_request);
   if (!request)
     return;
 
@@ skipping 672 matching lines @@
            sources_.begin();
        it != sources_.end(); ++it) {
     if (source.id() == it->id()) {
       sources_.erase(it);
       return;
     }
   }
 }
 
 }  // namespace content