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

content/renderer/pepper/pepper_media_device_manager.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/pepper/pepper_media_device_manager.h"
 
 #include "base/logging.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/render_view_impl.h"
 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
@@ skipping 36 matching lines @@
     const GURL& document_url,
     const EnumerateDevicesCallback& callback) {
   enumerate_callbacks_[next_id_] = callback;
   int request_id = next_id_++;
 
 #if defined(ENABLE_WEBRTC)
   GetRenderViewImpl()->media_stream_dispatcher()->EnumerateDevices(
       request_id,
       AsWeakPtr(),
       PepperMediaDeviceManager::FromPepperDeviceType(type),
-      document_url.GetOrigin());
+      document_url.GetOrigin(),
+      false);

[dmichael (off chromium), 2014/06/11 17:22:07]

I tend to prefer enum parameters to make code self-documenting.

In absence of that, please add a comment here to explain what false means.:
false /* hide_labels_if_no_access */);

 #else
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&PepperMediaDeviceManager::OnDevicesEnumerated,
                  AsWeakPtr(),
                  request_id,
                  StreamDeviceInfoArray()));
 #endif
 
   return request_id;
@@ skipping 165 matching lines @@
   open_callbacks_.erase(iter);
 
   callback.Run(request_id, succeeded, label);
 }
 
 RenderViewImpl* PepperMediaDeviceManager::GetRenderViewImpl() {
   return static_cast<RenderViewImpl*>(render_view());
 }
 
 }  // namespace content