[Cross-Site Isolation] Migrate entire MediaStream verticals to be per-RenderFrame.

chrome/browser/media/desktop_streams_registry.cc

 // Copyright 2013 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 "chrome/browser/media/desktop_streams_registry.h"
 
 #include "base/base64.h"
 #include "base/location.h"
 #include "base/time/time.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 14 matching lines @@
   return result;
 }
 
 }  // namespace
 
 DesktopStreamsRegistry::DesktopStreamsRegistry() {}
 DesktopStreamsRegistry::~DesktopStreamsRegistry() {}
 
 std::string DesktopStreamsRegistry::RegisterStream(
     int render_process_id,
-    int render_view_id,
+    int render_frame_id,
     const GURL& origin,
     const content::DesktopMediaID& source,
     const std::string& extension_name) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
-  std::string id = GenerateRandomStreamId();
+  std::string id;
+  do {
+    id = GenerateRandomStreamId();
+  } while (approved_streams_.find(id) != approved_streams_.end());

[Sergey Ulanov, 2014/07/16 19:29:47]

nit: This isn't really necessary. There are 128 bits of randomness - so
probability of collision is negligible, even if you generate 1M streams here.

[miu, 2014/07/16 20:43:29]

Okay, reverted.  I did leave in a DCHECK as a sanity-check to confirm the
GenerateRandomStreamId() function isn't being non-random in debug builds.

   ApprovedDesktopMediaStream& stream = approved_streams_[id];
   stream.render_process_id = render_process_id;
-  stream.render_view_id = render_view_id;
+  stream.render_frame_id = render_frame_id;
   stream.origin = origin;
   stream.source = source;
   stream.extension_name = extension_name;
 
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&DesktopStreamsRegistry::CleanupStream,
                  base::Unretained(this), id),
       base::TimeDelta::FromSeconds(kApprovedStreamTimeToLiveSeconds));
 
   return id;
 }
 
 content::DesktopMediaID DesktopStreamsRegistry::RequestMediaForStreamId(
     const std::string& id,
     int render_process_id,
-    int render_view_id,
+    int render_frame_id,
     const GURL& origin,
     std::string* extension_name) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   StreamsMap::iterator it = approved_streams_.find(id);
 
   // Verify that if there is a request with the specified ID it was created for
   // the same origin and the same renderer.
   if (it == approved_streams_.end() ||
       render_process_id != it->second.render_process_id ||
-      render_view_id != it->second.render_view_id ||
+      render_frame_id != it->second.render_frame_id ||
       origin != it->second.origin) {
     return content::DesktopMediaID();
   }
 
   content::DesktopMediaID result = it->second.source;
   *extension_name = it->second.extension_name;
   approved_streams_.erase(it);
   return result;
 }
 
 void DesktopStreamsRegistry::CleanupStream(const std::string& id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   approved_streams_.erase(id);
 }
 
 DesktopStreamsRegistry::ApprovedDesktopMediaStream::ApprovedDesktopMediaStream()
-    : render_process_id(-1), render_view_id(-1) {}
+    : render_process_id(-1), render_frame_id(-1) {}