Commit 8897b025 authored by Helen Li's avatar Helen Li Committed by Commit Bot

Remove unused URLRequestContextGetter from NaclHostMessageFilter

The field is unused.

Bug: 837333
Change-Id: I1179efd6af649d52d43f041fc7409125a7df7b1d
Reviewed-on: https://chromium-review.googlesource.com/1040207Reviewed-by: default avatarJochen Eisinger <jochen@chromium.org>
Commit-Queue: Helen Li <xunjieli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555704}
parent ac6c113c
...@@ -1235,12 +1235,8 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch( ...@@ -1235,12 +1235,8 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch(
#endif #endif
#if BUILDFLAG(ENABLE_NACL) #if BUILDFLAG(ENABLE_NACL)
net::URLRequestContextGetter* context = host->AddFilter(new nacl::NaClHostMessageFilter(id, profile->IsOffTheRecord(),
host->GetStoragePartition()->GetURLRequestContext(); profile->GetPath()));
host->AddFilter(new nacl::NaClHostMessageFilter(
id, profile->IsOffTheRecord(),
profile->GetPath(),
context));
#endif #endif
bool is_incognito_process = profile->IsOffTheRecord(); bool is_incognito_process = profile->IsOffTheRecord();
......
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "ipc/ipc_platform_file.h" #include "ipc/ipc_platform_file.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
#include "ppapi/shared_impl/ppapi_permissions.h" #include "ppapi/shared_impl/ppapi_permissions.h"
#include "url/gurl.h" #include "url/gurl.h"
...@@ -77,15 +75,12 @@ ppapi::PpapiPermissions GetPpapiPermissions(uint32_t permission_bits, ...@@ -77,15 +75,12 @@ ppapi::PpapiPermissions GetPpapiPermissions(uint32_t permission_bits,
NaClHostMessageFilter::NaClHostMessageFilter( NaClHostMessageFilter::NaClHostMessageFilter(
int render_process_id, int render_process_id,
bool is_off_the_record, bool is_off_the_record,
const base::FilePath& profile_directory, const base::FilePath& profile_directory)
net::URLRequestContextGetter* request_context)
: BrowserMessageFilter(NaClHostMsgStart), : BrowserMessageFilter(NaClHostMsgStart),
render_process_id_(render_process_id), render_process_id_(render_process_id),
off_the_record_(is_off_the_record), off_the_record_(is_off_the_record),
profile_directory_(profile_directory), profile_directory_(profile_directory),
request_context_(request_context), weak_ptr_factory_(this) {}
weak_ptr_factory_(this) {
}
NaClHostMessageFilter::~NaClHostMessageFilter() { NaClHostMessageFilter::~NaClHostMessageFilter() {
} }
...@@ -122,10 +117,6 @@ bool NaClHostMessageFilter::OnMessageReceived(const IPC::Message& message) { ...@@ -122,10 +117,6 @@ bool NaClHostMessageFilter::OnMessageReceived(const IPC::Message& message) {
return handled; return handled;
} }
net::HostResolver* NaClHostMessageFilter::GetHostResolver() {
return request_context_->GetURLRequestContext()->host_resolver();
}
void NaClHostMessageFilter::OnLaunchNaCl( void NaClHostMessageFilter::OnLaunchNaCl(
const nacl::NaClLaunchParams& launch_params, const nacl::NaClLaunchParams& launch_params,
IPC::Message* reply_msg) { IPC::Message* reply_msg) {
......
...@@ -22,11 +22,6 @@ struct NaClResourcePrefetchResult; ...@@ -22,11 +22,6 @@ struct NaClResourcePrefetchResult;
struct PnaclCacheInfo; struct PnaclCacheInfo;
} }
namespace net {
class HostResolver;
class URLRequestContextGetter;
}
namespace nacl { namespace nacl {
// This class filters out incoming Chrome-specific IPC messages for the renderer // This class filters out incoming Chrome-specific IPC messages for the renderer
...@@ -35,8 +30,7 @@ class NaClHostMessageFilter : public content::BrowserMessageFilter { ...@@ -35,8 +30,7 @@ class NaClHostMessageFilter : public content::BrowserMessageFilter {
public: public:
NaClHostMessageFilter(int render_process_id, NaClHostMessageFilter(int render_process_id,
bool is_off_the_record, bool is_off_the_record,
const base::FilePath& profile_directory, const base::FilePath& profile_directory);
net::URLRequestContextGetter* request_context);
// content::BrowserMessageFilter methods: // content::BrowserMessageFilter methods:
bool OnMessageReceived(const IPC::Message& message) override; bool OnMessageReceived(const IPC::Message& message) override;
...@@ -45,7 +39,6 @@ class NaClHostMessageFilter : public content::BrowserMessageFilter { ...@@ -45,7 +39,6 @@ class NaClHostMessageFilter : public content::BrowserMessageFilter {
int render_process_id() { return render_process_id_; } int render_process_id() { return render_process_id_; }
bool off_the_record() { return off_the_record_; } bool off_the_record() { return off_the_record_; }
const base::FilePath& profile_directory() const { return profile_directory_; } const base::FilePath& profile_directory() const { return profile_directory_; }
net::HostResolver* GetHostResolver();
private: private:
friend class content::BrowserThread; friend class content::BrowserThread;
...@@ -93,7 +86,6 @@ class NaClHostMessageFilter : public content::BrowserMessageFilter { ...@@ -93,7 +86,6 @@ class NaClHostMessageFilter : public content::BrowserMessageFilter {
// read on the IO thread. // read on the IO thread.
bool off_the_record_; bool off_the_record_;
base::FilePath profile_directory_; base::FilePath profile_directory_;
scoped_refptr<net::URLRequestContextGetter> request_context_;
base::WeakPtrFactory<NaClHostMessageFilter> weak_ptr_factory_; base::WeakPtrFactory<NaClHostMessageFilter> weak_ptr_factory_;
......
...@@ -109,10 +109,8 @@ void ShellContentBrowserClient::RenderProcessWillLaunch( ...@@ -109,10 +109,8 @@ void ShellContentBrowserClient::RenderProcessWillLaunch(
// the concept of disabled plugins. // the concept of disabled plugins.
#if BUILDFLAG(ENABLE_NACL) #if BUILDFLAG(ENABLE_NACL)
host->AddFilter(new nacl::NaClHostMessageFilter( host->AddFilter(new nacl::NaClHostMessageFilter(
render_process_id, render_process_id, browser_context->IsOffTheRecord(),
browser_context->IsOffTheRecord(), browser_context->GetPath()));
browser_context->GetPath(),
host->GetStoragePartition()->GetURLRequestContext()));
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment