Make default media device ID salts random by default

content/browser/renderer_host/media/media_stream_dispatcher_host.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_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 15 matching lines @@
 class MediaStreamUIProxy;
 class ResourceContext;
 
 // MediaStreamDispatcherHost is a delegate for Media Stream API messages used by
 // MediaStreamImpl.  There is one MediaStreamDispatcherHost per
 // RenderProcessHost, the former owned by the latter.
 class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter,
                                                  public MediaStreamRequester {
  public:
   MediaStreamDispatcherHost(int render_process_id,
-                            const ResourceContext::SaltCallback& salt_callback,
+                            const std::string& salt,
                             MediaStreamManager* media_stream_manager,
                             bool use_fake_ui = false);
 
   // MediaStreamRequester implementation.
   void StreamGenerated(int render_frame_id,
                        int page_request_id,
                        const std::string& label,
                        const StreamDeviceInfoArray& audio_devices,
                        const StreamDeviceInfoArray& video_devices) override;
   void StreamGenerationFailed(
@@ skipping 64 matching lines @@
   void OnSetCapturingLinkSecured(int session_id,
                                  content::MediaStreamType type,
                                  bool is_secure);
 
   std::unique_ptr<MediaStreamUIProxy> CreateMediaStreamUIProxy();
   void HandleCheckAccessResponse(std::unique_ptr<MediaStreamUIProxy> ui_proxy,
                                  int render_frame_id,
                                  bool have_access);
 
   int render_process_id_;
-  ResourceContext::SaltCallback salt_callback_;
+  std::string salt_;
   MediaStreamManager* media_stream_manager_;
 
   struct DeviceChangeSubscriberInfo {
     int render_frame_id;
     url::Origin security_origin;
   };
   std::vector<DeviceChangeSubscriberInfo> device_change_subscribers_;
   bool use_fake_ui_;
 
   base::WeakPtrFactory<MediaStreamDispatcherHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_