diff options
author | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 00:19:31 +0000 |
---|---|---|
committer | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 00:19:31 +0000 |
commit | f4ea11288982f7b94ad7a7780cf0aa1a08e29509 (patch) | |
tree | ffb3e5ef8aa56511216b67cecc03f6ddc44d0e40 /chrome/browser/net/url_fetcher.cc | |
parent | a6d953ed61489bec9075f7441df3c2d559946de1 (diff) | |
download | chromium_src-f4ea11288982f7b94ad7a7780cf0aa1a08e29509.zip chromium_src-f4ea11288982f7b94ad7a7780cf0aa1a08e29509.tar.gz chromium_src-f4ea11288982f7b94ad7a7780cf0aa1a08e29509.tar.bz2 |
Add a browser test for extensions autoupdate.
BUG=17826,19403
TEST=none
Review URL: http://codereview.chromium.org/270019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/url_fetcher.cc')
-rw-r--r-- | chrome/browser/net/url_fetcher.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/net/url_fetcher.cc b/chrome/browser/net/url_fetcher.cc index f0a2a3f..5052bb3 100644 --- a/chrome/browser/net/url_fetcher.cc +++ b/chrome/browser/net/url_fetcher.cc @@ -18,6 +18,8 @@ static const int kBufferSize = 4096; +bool URLFetcher::g_interception_enabled = false; + class URLFetcher::Core : public base::RefCountedThreadSafe<URLFetcher::Core>, public URLRequest::Delegate { @@ -196,8 +198,11 @@ void URLFetcher::Core::StartURLRequest() { DCHECK(!request_); request_ = new URLRequest(original_url_, this); - request_->set_load_flags( - request_->load_flags() | net::LOAD_DISABLE_INTERCEPT | load_flags_); + int flags = request_->load_flags() | load_flags_; + if (!g_interception_enabled) { + flags = flags | net::LOAD_DISABLE_INTERCEPT; + } + request_->set_load_flags(flags); request_->set_context(request_context_.get()); switch (request_type_) { |