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

content/browser/renderer_host/media/device_request_message_filter_unittest.cc

Index: content/browser/renderer_host/media/device_request_message_filter_unittest.cc
diff --git a/content/browser/renderer_host/media/device_request_message_filter_unittest.cc b/content/browser/renderer_host/media/device_request_message_filter_unittest.cc
index 13a1cdbd2f6c17db68ce802b440d54bb8128ddc3..7168d714797892f423225c8b6486fb92a899969b 100644
--- a/content/browser/renderer_host/media/device_request_message_filter_unittest.cc
+++ b/content/browser/renderer_host/media/device_request_message_filter_unittest.cc
@@ -25,10 +25,11 @@ class MockMediaStreamManager : public MediaStreamManager {
 
   virtual ~MockMediaStreamManager() {}
 
-  MOCK_METHOD6(EnumerateDevices,
+  MOCK_METHOD7(EnumerateDevices,
                std::string(MediaStreamRequester* requester,
                            int render_process_id,
                            int render_view_id,
+                           ResourceContext* rc,
                            int page_request_id,
                            MediaStreamType type,
                            const GURL& security_origin));
@@ -37,6 +38,7 @@ class MockMediaStreamManager : public MediaStreamManager {
   std::string DoEnumerateDevices(MediaStreamRequester* requester,
                                  int render_process_id,
                                  int render_view_id,
+                                 ResourceContext* rc,
                                  int page_request_id,
                                  MediaStreamType type,
                                  const GURL& security_origin) {
@@ -93,10 +95,10 @@ class DeviceRequestMessageFilterTest : public testing::Test {
     AddVideoDevices(number_video_devices);
     GURL origin("https://test.com");
     EXPECT_CALL(*media_stream_manager_,
-                EnumerateDevices(_, _, _, _, MEDIA_DEVICE_AUDIO_CAPTURE, _))
+                EnumerateDevices(_, _,_, _, _, MEDIA_DEVICE_AUDIO_CAPTURE, _))

[perkj_chrome, 2013/11/01 15:49:06]

darn

         .Times(1);
     EXPECT_CALL(*media_stream_manager_,
-                EnumerateDevices(_, _, _, _, MEDIA_DEVICE_VIDEO_CAPTURE, _))
+                EnumerateDevices(_, _, _, _, _, MEDIA_DEVICE_VIDEO_CAPTURE, _))
         .Times(1);
     // Send message to get devices. Should trigger 2 EnumerateDevice() requests.
     const int kRequestId = 123;
@@ -137,7 +139,7 @@ class DeviceRequestMessageFilterTest : public testing::Test {
         new TestBrowserThread(BrowserThread::IO, message_loop_.get()));
 
     media_stream_manager_.reset(new MockMediaStreamManager());
-    ON_CALL(*media_stream_manager_, EnumerateDevices(_, _, _, _, _, _))
+    ON_CALL(*media_stream_manager_, EnumerateDevices(_, _, _, _, _, _, _))
         .WillByDefault(Invoke(media_stream_manager_.get(),
                               &MockMediaStreamManager::DoEnumerateDevices));