Implement a salt for MediaSource IDs that can be cleared by a user.

content/browser/renderer_host/media/media_stream_manager.h

Index: content/browser/renderer_host/media/media_stream_manager.h
diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
index 9b5061bb3d142d1ddb246c248d598888b86f7548..82cac4f5176ee0352fdb91c16e3b19eefbccfbbb 100644
--- a/content/browser/renderer_host/media/media_stream_manager.h
+++ b/content/browser/renderer_host/media/media_stream_manager.h
@@ -51,6 +51,7 @@ class FakeMediaStreamUIProxy;
 class MediaStreamDeviceSettings;
 class MediaStreamRequester;
 class MediaStreamUIProxy;
+class ResourceContext;
 class VideoCaptureManager;
 
 // MediaStreamManager is used to generate and close new media devices, not to
@@ -96,6 +97,7 @@ class CONTENT_EXPORT MediaStreamManager
   std::string GenerateStream(MediaStreamRequester* requester,
                              int render_process_id,
                              int render_view_id,
+                             ResourceContext* rc,
                              int page_request_id,
                              const StreamOptions& components,
                              const GURL& security_origin);
@@ -119,6 +121,7 @@ class CONTENT_EXPORT MediaStreamManager
   virtual std::string EnumerateDevices(MediaStreamRequester* requester,
                                        int render_process_id,
                                        int render_view_id,
+                                       ResourceContext* rc,
                                        int page_request_id,
                                        MediaStreamType type,
                                        const GURL& security_origin);
@@ -129,6 +132,7 @@ class CONTENT_EXPORT MediaStreamManager
   std::string OpenDevice(MediaStreamRequester* requester,
                          int render_process_id,
                          int render_view_id,
+                         ResourceContext* rc,
                          int page_request_id,
                          const std::string& device_id,
                          MediaStreamType type,
@@ -238,17 +242,15 @@ class CONTENT_EXPORT MediaStreamManager
   void HandleRequest(const std::string& label);
   bool SetupTabCaptureRequest(DeviceRequest* request);
   bool SetupScreenCaptureRequest(DeviceRequest* request);
-  // Returns true if a device with |device_id| has already been requested by
-  // |render_process_id| and |render_view_id| of type |type|. If it has been
-  // requested, |device_info| contain information about the device.
-  bool FindExistingRequestedDeviceInfo(int render_process_id,
-                                       int render_view_id,
-                                       const GURL& security_origin,
-                                       MediaStreamRequestType type,
-                                       const std::string& device_id,
-                                       MediaStreamType device_type,
-                                       StreamDeviceInfo* device_info,
-                                       MediaRequestState* request_state) const;
+  // Returns true if a device with |device_id| has already been requested with
+  // a render procecss_id and render_view_id and type equal to the the values
+  // in |request|. If it has been requested, |device_info| contain information
+  // about the device.
+  bool FindExistingRequestedDeviceInfo(
+      const DeviceRequest* new_request,

[tommi (sloooow) - chröme, 2013/11/01 17:21:37]

is new_request past as a pointer since it can be null?  If it can never be NULL,
should we use const &?

[perkj_chrome, 2013/11/01 19:01:56]

Done.

+      const MediaStreamDevice& new_device_info,
+      StreamDeviceInfo* existing_device_info,
+      MediaRequestState* existing_request_state) const;
 
   void FinalizeGenerateStream(const std::string& label,
                               DeviceRequest* request);
@@ -266,8 +268,8 @@ class CONTENT_EXPORT MediaStreamManager
   void StartMonitoring();
   void StopMonitoring();
 
-  bool TranslateRequestedSourceIdToDeviceId(MediaStreamRequest* request);
-  void TranslateDeviceIdToSourceId(const MediaStreamRequest& request,
+  bool TranslateRequestedSourceIdToDeviceId(DeviceRequest* request);
+  void TranslateDeviceIdToSourceId(DeviceRequest* request,
                                    MediaStreamDevice* device);
 
   // Finds and returns the device id corresponding to the given
@@ -275,6 +277,7 @@ class CONTENT_EXPORT MediaStreamManager
   // given |source_id|, false if nothing matched it.
   bool TranslateSourceIdToDeviceId(
       MediaStreamType stream_type,
+      ResourceContext* rc,
       const GURL& security_origin,
       const std::string& source_id,
       std::string* device_id);