Index: content/browser/plugin_service_impl.cc |
=================================================================== |
--- content/browser/plugin_service_impl.cc (revision 121250) |
+++ content/browser/plugin_service_impl.cc (working copy) |
@@ -293,7 +293,7 @@ |
// This plugin isn't loaded by any plugin process, so create a new process. |
return PpapiPluginProcessHost::CreatePluginHost( |
*info, |
- client->GetResourceContext()->host_resolver()); |
+ client->GetResourceContext()->GetHostResolver()); |
} |
PpapiPluginProcessHost* PluginServiceImpl::FindOrStartPpapiBrokerProcess( |
@@ -332,7 +332,7 @@ |
render_process_id, |
render_view_id, |
page_url, |
- &client->GetResourceContext() |
+ client->GetResourceContext() |
}; |
GetPlugins(base::Bind( |
&PluginServiceImpl::ForwardGetAllowedPluginForOpenChannelToPlugin, |
@@ -385,11 +385,11 @@ |
const GURL& page_url, |
const std::string& mime_type, |
PluginProcessHost::Client* client, |
- const content::ResourceContext* resource_context) { |
+ content::ResourceContext* resource_context) { |
webkit::WebPluginInfo info; |
bool allow_wildcard = true; |
bool found = GetPluginInfo( |
- render_process_id, render_view_id, *resource_context, |
+ render_process_id, render_view_id, resource_context, |
url, page_url, mime_type, allow_wildcard, |
NULL, &info, NULL); |
FilePath plugin_path; |
@@ -436,7 +436,7 @@ |
bool PluginServiceImpl::GetPluginInfo(int render_process_id, |
int render_view_id, |
- const content::ResourceContext& context, |
+ content::ResourceContext* context, |
const GURL& url, |
const GURL& page_url, |
const std::string& mime_type, |
@@ -454,7 +454,7 @@ |
for (size_t i = 0; i < plugins.size(); ++i) { |
if (!filter_ || filter_->ShouldUsePlugin(render_process_id, |
render_view_id, |
- &context, |
+ context, |
url, |
page_url, |
&plugins[i])) { |