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

chrome/browser/extensions/api/tab_capture/tab_capture_registry.h

Index: chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
index 54fd9e61b0ca97fe38a60bdf49eef5c227cb4db9..ef65028bc7903a44d16ef17b5dcaeced547dacfe 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
@@ -14,13 +14,12 @@
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/common/extensions/api/tab_capture.h"
 #include "content/public/browser/media_request_state.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/browser/extension_registry_observer.h"
 
 namespace content {
 class BrowserContext;
+class WebContents;
 }
 
 namespace extensions {
@@ -32,7 +31,6 @@ class FullscreenObserver;
 namespace tab_capture = api::tab_capture;
 
 class TabCaptureRegistry : public BrowserContextKeyedAPI,
-                           public content::NotificationObserver,

[ncarter (slow), 2014/07/10 01:17:51]

You are a saint.

[miu, 2014/07/10 22:16:11]

:)

                            public ExtensionRegistryObserver,
                            public MediaCaptureDevicesDispatcher::Observer {
  public:
@@ -51,15 +49,15 @@ class TabCaptureRegistry : public BrowserContextKeyedAPI,
 
   // Add a tab capture request to the registry when a stream is requested
   // through the API.
-  bool AddRequest(int render_process_id,
-                  int render_view_id,
+  bool AddRequest(content::WebContents* target_contents,

[ncarter (slow), 2014/07/10 01:17:51]

Could you document the parameters here? In particular, could make it 100%
unambiguous that |target_contents| and |tab_id| represent the tab being
captured, and not the tab requesting the capture?

[miu, 2014/07/10 22:16:11]

Done.

                   const std::string& extension_id,
                   int tab_id,

[ncarter (slow), 2014/07/10 01:17:51]

If we have the |target_contents|, do we need the tab_id as well?

[miu, 2014/07/10 22:16:11]

Excellent point.  In fact, I was able to remove both this and the last argument.

                   tab_capture::TabCaptureState status);
 
   // The MediaStreamDevicesController will verify the request before creating
   // the stream by checking the registry here.

[ncarter (slow), 2014/07/10 01:17:51]

What about the request, exactly, is verified? It might be helpful to give an
example of when this verification might fail.

[miu, 2014/07/10 22:16:11]

Done.

-  bool VerifyRequest(int render_process_id, int render_view_id);
+  bool VerifyRequest(const content::WebContents* target_contents,
+                     const std::string& extension_id);
 
  private:
   friend class BrowserContextKeyedAPIFactory<TabCaptureRegistry>;
@@ -76,11 +74,6 @@ class TabCaptureRegistry : public BrowserContextKeyedAPI,
   static const bool kServiceIsCreatedWithBrowserContext = false;
   static const bool kServiceRedirectedInIncognito = true;
 
-  // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   // ExtensionRegistryObserver implementation.
   virtual void OnExtensionUnloaded(
       content::BrowserContext* browser_context,
@@ -90,18 +83,15 @@ class TabCaptureRegistry : public BrowserContextKeyedAPI,
   // MediaCaptureDevicesDispatcher::Observer implementation.
   virtual void OnRequestUpdate(
       int render_process_id,
-      int render_view_id,
-      const content::MediaStreamDevice& device,
+      int render_frame_id,
+      content::MediaStreamType stream_type,
       const content::MediaRequestState state) OVERRIDE;
 
   void DispatchStatusChangeEvent(const TabCaptureRequest* request) const;
 
-  TabCaptureRequest* FindCaptureRequest(int render_process_id,
-                                        int render_view_id) const;
-
-  void DeleteCaptureRequest(int render_process_id, int render_view_id);
+  TabCaptureRequest* FindCaptureRequest(
+      const content::WebContents* target_contents) const;
 
-  content::NotificationRegistrar registrar_;
   content::BrowserContext* const browser_context_;
   ScopedVector<TabCaptureRequest> requests_;