summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/apps/app_url_redirector.cc8
-rw-r--r--chrome/browser/apps/ephemeral_app_throttle.cc12
-rw-r--r--chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc4
-rw-r--r--chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc6
-rw-r--r--chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc5
-rw-r--r--chrome/browser/extensions/extension_protocols_unittest.cc1
-rw-r--r--chrome/browser/prerender/prerender_tracker_unittest.cc9
-rw-r--r--chrome/browser/search/iframe_source_unittest.cc2
-rw-r--r--chrome/browser/task_manager/guest_resource_provider.cc5
-rw-r--r--chrome/browser/ui/blocked_content/blocked_window_params.cc5
10 files changed, 27 insertions, 30 deletions
diff --git a/chrome/browser/apps/app_url_redirector.cc b/chrome/browser/apps/app_url_redirector.cc
index cfa5ce2..5a87e75 100644
--- a/chrome/browser/apps/app_url_redirector.cc
+++ b/chrome/browser/apps/app_url_redirector.cc
@@ -35,7 +35,7 @@ namespace {
bool LaunchAppWithUrl(
const scoped_refptr<const Extension> app,
const std::string& handler_id,
- content::RenderViewHost* source,
+ content::WebContents* source,
const navigation_interception::NavigationParams& params) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -50,12 +50,8 @@ bool LaunchAppWithUrl(
DCHECK(!params.is_post());
DCHECK(UrlHandlers::CanExtensionHandleUrl(app, params.url()));
- WebContents* web_contents = WebContents::FromRenderViewHost(source);
- if (!web_contents)
- return false;
-
Profile* profile =
- Profile::FromBrowserContext(web_contents->GetBrowserContext());
+ Profile::FromBrowserContext(source->GetBrowserContext());
DVLOG(1) << "Launching app handler with URL: "
<< params.url().spec() << " -> "
diff --git a/chrome/browser/apps/ephemeral_app_throttle.cc b/chrome/browser/apps/ephemeral_app_throttle.cc
index fafda3f..ec19909 100644
--- a/chrome/browser/apps/ephemeral_app_throttle.cc
+++ b/chrome/browser/apps/ephemeral_app_throttle.cc
@@ -30,7 +30,7 @@ namespace {
bool LaunchEphemeralApp(
const std::string& app_id,
- content::RenderViewHost* source,
+ content::WebContents* source,
const navigation_interception::NavigationParams& params) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -38,12 +38,8 @@ bool LaunchEphemeralApp(
if (source->IsSubframe())
return false;
- WebContents* web_contents = WebContents::FromRenderViewHost(source);
- if (!web_contents)
- return false;
-
Profile* profile =
- Profile::FromBrowserContext(web_contents->GetBrowserContext());
+ Profile::FromBrowserContext(source->GetBrowserContext());
if (!profile)
return false;
@@ -56,7 +52,7 @@ bool LaunchEphemeralApp(
// If the app is already installed, launch it.
AppLaunchParams params(profile, extension, NEW_FOREGROUND_TAB);
params.desktop_type = chrome::GetHostDesktopTypeForNativeView(
- web_contents->GetView()->GetNativeView());
+ source->GetView()->GetNativeView());
OpenApplication(params);
return true;
}
@@ -64,7 +60,7 @@ bool LaunchEphemeralApp(
if (!extension) {
// Install ephemeral app and launch.
scoped_refptr<EphemeralAppLauncher> installer =
- EphemeralAppLauncher::CreateForLink(app_id, web_contents);
+ EphemeralAppLauncher::CreateForLink(app_id, source);
installer->Start();
return true;
}
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
index ab8c843..b350afc 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
@@ -92,14 +92,14 @@ TEST(WebRequestConditionAttributeTest, ResourceType) {
net::TestURLRequest url_request_ok(
GURL("http://www.example.com"), net::DEFAULT_PRIORITY, NULL, &context);
content::ResourceRequestInfo::AllocateForTesting(
- &url_request_ok, ResourceType::SUB_FRAME, NULL, -1, -1, false);
+ &url_request_ok, ResourceType::SUB_FRAME, NULL, -1, -1, -1, false);
EXPECT_TRUE(attribute->IsFulfilled(WebRequestData(&url_request_ok,
ON_BEFORE_REQUEST)));
net::TestURLRequest url_request_fail(
GURL("http://www.example.com"), net::DEFAULT_PRIORITY, NULL, &context);
content::ResourceRequestInfo::AllocateForTesting(
- &url_request_fail, ResourceType::MAIN_FRAME, NULL, -1, -1, false);
+ &url_request_fail, ResourceType::MAIN_FRAME, NULL, -1, -1, -1, false);
EXPECT_FALSE(attribute->IsFulfilled(WebRequestData(&url_request_fail,
ON_BEFORE_REQUEST)));
}
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc
index 8531a15..d49a32d 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc
@@ -84,7 +84,7 @@ TEST(WebRequestConditionTest, CreateCondition) {
request_data.url_match_ids = matcher.MatchURL(http_url);
EXPECT_EQ(1u, request_data.url_match_ids.size());
content::ResourceRequestInfo::AllocateForTesting(
- &match_request, ResourceType::MAIN_FRAME, NULL, -1, -1, false);
+ &match_request, ResourceType::MAIN_FRAME, NULL, -1, -1, -1, false);
EXPECT_TRUE(result->IsFulfilled(request_data));
const GURL https_url("https://www.example.com");
@@ -95,7 +95,7 @@ TEST(WebRequestConditionTest, CreateCondition) {
// Make sure IsFulfilled does not fail because of URL matching.
EXPECT_EQ(1u, request_data.url_match_ids.size());
content::ResourceRequestInfo::AllocateForTesting(
- &wrong_resource_type, ResourceType::SUB_FRAME, NULL, -1, -1, false);
+ &wrong_resource_type, ResourceType::SUB_FRAME, NULL, -1, -1, -1, false);
EXPECT_FALSE(result->IsFulfilled(request_data));
}
@@ -135,7 +135,7 @@ TEST(WebRequestConditionTest, CreateConditionFirstPartyForCookies) {
request_data.first_party_url_match_ids = matcher.MatchURL(first_party_url);
EXPECT_EQ(1u, request_data.first_party_url_match_ids.size());
content::ResourceRequestInfo::AllocateForTesting(
- &match_request, ResourceType::MAIN_FRAME, NULL, -1, -1, false);
+ &match_request, ResourceType::MAIN_FRAME, NULL, -1, -1, -1, false);
EXPECT_TRUE(result->IsFulfilled(request_data));
}
diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
index c9e03b0..4d0a4b57 100644
--- a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
@@ -11,6 +11,7 @@
#include "content/public/browser/resource_request_info.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "extensions/browser/info_map.h"
+#include "ipc/ipc_message.h"
#include "net/base/request_priority.h"
#include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -128,7 +129,7 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
non_sensitive_url, net::DEFAULT_PRIORITY, NULL, &context);
ResourceRequestInfo::AllocateForTesting(
&sensitive_request, ResourceType::SCRIPT, NULL,
- process_id, frame_id, false);
+ process_id, frame_id, MSG_ROUTING_NONE, false);
extension_info_map_->RegisterExtensionProcess(
extension_misc::kWebStoreAppId, process_id, site_instance_id);
EXPECT_TRUE(WebRequestPermissions::HideRequest(extension_info_map_.get(),
@@ -142,7 +143,7 @@ TEST_F(ExtensionWebRequestHelpersTestWithThreadsTest, TestHideRequestForURL) {
non_sensitive_url, net::DEFAULT_PRIORITY, NULL, &context);
ResourceRequestInfo::AllocateForTesting(
&sensitive_request, ResourceType::SCRIPT, NULL,
- process_id, frame_id, false);
+ process_id, frame_id, MSG_ROUTING_NONE, false);
EXPECT_TRUE(WebRequestPermissions::HideRequest(extension_info_map_.get(),
&sensitive_request));
}
diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc
index 74e52bc..a39a89a 100644
--- a/chrome/browser/extensions/extension_protocols_unittest.cc
+++ b/chrome/browser/extensions/extension_protocols_unittest.cc
@@ -122,6 +122,7 @@ class ExtensionProtocolTest : public testing::Test {
&resource_context_,
-1,
-1,
+ -1,
false);
request->Start();
base::MessageLoop::current()->Run();
diff --git a/chrome/browser/prerender/prerender_tracker_unittest.cc b/chrome/browser/prerender/prerender_tracker_unittest.cc
index b96159a..9293d69 100644
--- a/chrome/browser/prerender/prerender_tracker_unittest.cc
+++ b/chrome/browser/prerender/prerender_tracker_unittest.cc
@@ -20,6 +20,7 @@
#include "content/public/browser/resource_request_info.h"
#include "content/public/test/test_browser_thread.h"
#include "content/test/net/url_request_mock_http_job.h"
+#include "ipc/ipc_message.h"
#include "net/base/request_priority.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_test_util.h"
@@ -534,7 +535,7 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectResume) {
&url_request_context);
content::ResourceRequestInfo::AllocateForTesting(
&request, ResourceType::IMAGE, NULL,
- kDefaultChildId, kDefaultRouteId, true);
+ kDefaultChildId, kDefaultRouteId, MSG_ROUTING_NONE, true);
// Install a prerender throttle.
PrerenderResourceThrottle throttle(&request, prerender_tracker());
@@ -574,7 +575,7 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectCancel) {
&url_request_context);
content::ResourceRequestInfo::AllocateForTesting(
&request, ResourceType::IMAGE, NULL,
- kDefaultChildId, kDefaultRouteId, true);
+ kDefaultChildId, kDefaultRouteId, MSG_ROUTING_NONE, true);
// Install a prerender throttle.
PrerenderResourceThrottle throttle(&request, prerender_tracker());
@@ -614,7 +615,7 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectMainFrame) {
&url_request_context);
content::ResourceRequestInfo::AllocateForTesting(
&request, ResourceType::MAIN_FRAME, NULL,
- kDefaultChildId, kDefaultRouteId, true);
+ kDefaultChildId, kDefaultRouteId, MSG_ROUTING_NONE, true);
// Install a prerender throttle.
PrerenderResourceThrottle throttle(&request, prerender_tracker());
@@ -653,7 +654,7 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectSyncXHR) {
&url_request_context);
content::ResourceRequestInfo::AllocateForTesting(
&request, ResourceType::XHR, NULL,
- kDefaultChildId, kDefaultRouteId, false);
+ kDefaultChildId, kDefaultRouteId, MSG_ROUTING_NONE, false);
// Install a prerender throttle.
PrerenderResourceThrottle throttle(&request, prerender_tracker());
diff --git a/chrome/browser/search/iframe_source_unittest.cc b/chrome/browser/search/iframe_source_unittest.cc
index cf40af7..899b168 100644
--- a/chrome/browser/search/iframe_source_unittest.cc
+++ b/chrome/browser/search/iframe_source_unittest.cc
@@ -14,6 +14,7 @@
#include "content/public/test/mock_resource_context.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "grit/browser_resources.h"
+#include "ipc/ipc_message.h"
#include "net/base/request_priority.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h"
@@ -107,6 +108,7 @@ class IframeSourceTest : public testing::Test {
&resource_context_,
render_process_id,
render_view_id,
+ MSG_ROUTING_NONE,
false);
}
return request;
diff --git a/chrome/browser/task_manager/guest_resource_provider.cc b/chrome/browser/task_manager/guest_resource_provider.cc
index 787029a..b27678b 100644
--- a/chrome/browser/task_manager/guest_resource_provider.cc
+++ b/chrome/browser/task_manager/guest_resource_provider.cc
@@ -138,7 +138,8 @@ void GuestResourceProvider::StartUpdating() {
while (content::RenderWidgetHost* widget = widgets->GetNextHost()) {
if (widget->IsRenderView()) {
RenderViewHost* rvh = RenderViewHost::From(widget);
- if (rvh->IsSubframe())
+ WebContents* web_contents = WebContents::FromRenderViewHost(rvh);
+ if (web_contents->IsSubframe())
Add(rvh);
}
}
@@ -190,7 +191,7 @@ void GuestResourceProvider::Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details) {
WebContents* web_contents = content::Source<WebContents>(source).ptr();
- if (!web_contents || !web_contents->GetRenderViewHost()->IsSubframe())
+ if (!web_contents || !web_contents->IsSubframe())
return;
switch (type) {
diff --git a/chrome/browser/ui/blocked_content/blocked_window_params.cc b/chrome/browser/ui/blocked_content/blocked_window_params.cc
index f05f8e8..69fdaea 100644
--- a/chrome/browser/ui/blocked_content/blocked_window_params.cc
+++ b/chrome/browser/ui/blocked_content/blocked_window_params.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
#include "third_party/WebKit/public/web/WebWindowFeatures.h"
@@ -34,8 +34,7 @@ BlockedWindowParams::BlockedWindowParams(
chrome::NavigateParams BlockedWindowParams::CreateNavigateParams(
content::WebContents* web_contents) const {
GURL popup_url(target_url_);
- content::RenderViewHost::FilterURL(
- web_contents->GetRenderProcessHost(), false, &popup_url);
+ web_contents->GetRenderProcessHost()->FilterURL(false, &popup_url);
chrome::NavigateParams nav_params(
Profile::FromBrowserContext(web_contents->GetBrowserContext()),
popup_url,
generated by cgit v1.1 at 2025-02-08 18:52:48 +0000