summaryrefslogtreecommitdiffstats
path: root/android_webview/browser/net
diff options
context:
space:
mode:
authorpauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-02 17:36:07 +0000
committerpauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-02 17:36:07 +0000
commit693845e44965a358274812ff75aa23ca80625658 (patch)
tree94a7e351f547338af6f61439b50fdffe285b1593 /android_webview/browser/net
parentc29fa668ab381858720aefd63093ea4017604c71 (diff)
downloadchromium_src-693845e44965a358274812ff75aa23ca80625658.zip
chromium_src-693845e44965a358274812ff75aa23ca80625658.tar.gz
chromium_src-693845e44965a358274812ff75aa23ca80625658.tar.bz2
Convert AwRequestInerceptor to net::URLRequestJobFactory::ProtocolHandler
BUG=161534 Review URL: https://chromiumcodereview.appspot.com/11678008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174807 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser/net')
-rw-r--r--android_webview/browser/net/aw_url_request_context_getter.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index b6d3d25..f80f0c2 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -18,6 +18,7 @@
#include "net/proxy/proxy_service.h"
#include "net/url_request/data_protocol_handler.h"
#include "net/url_request/file_protocol_handler.h"
+#include "net/url_request/protocol_intercept_job_factory.h"
#include "net/url_request/url_request_context_builder.h"
#include "net/url_request/url_request_context.h"
@@ -101,7 +102,6 @@ void AwURLRequestContextGetter::Init() {
set_protocol = job_factory->SetProtocolHandler(
chrome::kDataScheme, new net::DataProtocolHandler());
DCHECK(set_protocol);
- job_factory->AddInterceptor(new AwRequestInterceptor());
// TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads.
net::HttpNetworkSession::Params network_session_params;
@@ -118,6 +118,10 @@ void AwURLRequestContextGetter::Init() {
job_factory_ = CreateAndroidJobFactoryAndCookieMonster(
url_request_context_.get(), job_factory.Pass());
+ job_factory_.reset(new net::ProtocolInterceptJobFactory(
+ job_factory_.Pass(),
+ scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>(
+ new AwRequestInterceptor())));
url_request_context_->set_job_factory(job_factory_.get());
}