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

Unified Diff: chrome/browser/content_settings/permission_context_base_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
Index: chrome/browser/content_settings/permission_context_base_unittest.cc
diff --git a/chrome/browser/content_settings/permission_context_base_unittest.cc b/chrome/browser/content_settings/permission_context_base_unittest.cc
index 92be54ecd0f8f04d40b1659bf3f69885ed6b3864..35f361a1598e2763c8a1e55606342dc5c2cf167e 100644
--- a/chrome/browser/content_settings/permission_context_base_unittest.cc
+++ b/chrome/browser/content_settings/permission_context_base_unittest.cc
@@ -16,6 +16,7 @@
#include "components/content_settings/core/common/content_settings.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 "content/public/test/web_contents_tester.h"
@@ -108,7 +109,7 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
const PermissionRequestID id(
web_contents()->GetRenderProcessHost()->GetID(),
- web_contents()->GetRenderViewHost()->GetRoutingID(),
+ web_contents()->GetMainFrame()->GetRoutingID(),
-1, GURL());
permission_context.RequestPermission(
web_contents(),
@@ -136,7 +137,7 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
const PermissionRequestID id(
web_contents()->GetRenderProcessHost()->GetID(),
- web_contents()->GetRenderViewHost()->GetRoutingID(),
+ web_contents()->GetMainFrame()->GetRoutingID(),
-1, GURL());
permission_context.RequestPermission(
web_contents(),
@@ -164,7 +165,7 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
const PermissionRequestID id(
web_contents()->GetRenderProcessHost()->GetID(),
- web_contents()->GetRenderViewHost()->GetRoutingID(),
+ web_contents()->GetMainFrame()->GetRoutingID(),
-1, GURL());
permission_context.RequestPermission(
web_contents(),
@@ -190,7 +191,7 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
const PermissionRequestID id(
web_contents()->GetRenderProcessHost()->GetID(),
- web_contents()->GetRenderViewHost()->GetRoutingID(),
+ web_contents()->GetMainFrame()->GetRoutingID(),
-1, GURL());
permission_context.RequestPermission(
web_contents(),
« no previous file with comments | « android_webview/native/aw_contents.cc ('k') | chrome/browser/content_settings/permission_queue_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698