Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1191)

Unified Diff: chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc

Issue 364123002: [Cross-Site Isolation] Migrate entire MediaStream verticals to be per-RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: It's random enough. + REBASE Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
index 9af79344df6d0c6054c6b4c74de53de15c95ed0e..bbca11a46bbd0b14cf94d5c539b29529258c9f04 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
@@ -11,8 +11,8 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
#include "chrome/common/chrome_version_info.h"
+#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
-#include "content/public/browser/render_view_host.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/common/switches.h"
@@ -119,11 +119,11 @@ IN_PROC_BROWSER_TEST_F(TabCaptureApiTest, MAYBE_GetUserMediaTest) {
content::PAGE_TRANSITION_LINK, false);
content::WebContents* web_contents = browser()->OpenURL(params);
- content::RenderViewHost* const rvh = web_contents->GetRenderViewHost();
- int render_process_id = rvh->GetProcess()->GetID();
- int routing_id = rvh->GetRoutingID();
-
- listener.Reply(base::StringPrintf("%i:%i", render_process_id, routing_id));
+ content::RenderFrameHost* const main_frame = web_contents->GetMainFrame();
+ ASSERT_TRUE(main_frame);
+ listener.Reply(base::StringPrintf("web-contents-media-stream://%i:%i",
+ main_frame->GetProcess()->GetID(),
+ main_frame->GetRoutingID()));
ResultCatcher catcher;
catcher.RestrictToProfile(browser()->profile());

Powered by Google App Engine
This is Rietveld 408576698