chrome/browser/content_settings/permission_queue_controller_unittest.cc - Issue 1158813002: Use RenderFrameHost for ::RequestPermission() and ::CancelPermission().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/content_settings/permission_queue_controller_unittest.cc

Issue 1158813002: Use RenderFrameHost for ::RequestPermission() and ::CancelPermission(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: build fixes Created 5 years, 7 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

« no previous file with comments | « chrome/browser/content_settings/permission_queue_controller.cc ('k') | chrome/browser/content_settings/tab_specific_content_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/permission_queue_controller_unittest.cc

diff --git a/chrome/browser/content_settings/permission_queue_controller_unittest.cc b/chrome/browser/content_settings/permission_queue_controller_unittest.cc

index 4cc3eac8b2ab4d805a6e357b478f9749a4501185..d49dc2af67113c65813013d172492cd5d6de877f 100644

--- a/chrome/browser/content_settings/permission_queue_controller_unittest.cc

+++ b/chrome/browser/content_settings/permission_queue_controller_unittest.cc

@@ -11,6 +11,7 @@

#include "chrome/test/base/testing_profile.h"

#include "components/content_settings/core/common/content_settings_types.h"

#include "components/content_settings/core/common/permission_request_id.h"

+#include "content/public/browser/render_frame_host.h"

#include "content/public/browser/web_contents.h"

#include "content/public/test/mock_render_process_host.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -26,7 +27,7 @@ class PermissionQueueControllerTests : public ChromeRenderViewHostTestHarness {

PermissionRequestID RequestID(int bridge_id) {

return PermissionRequestID(

web_contents()->GetRenderProcessHost()->GetID(),

- web_contents()->GetRenderViewHost()->GetRoutingID(),

+ web_contents()->GetMainFrame()->GetRoutingID(),

bridge_id,

GURL());

}