diff options
| author | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 23:40:30 +0000 |
|---|---|---|
| committer | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-24 23:40:30 +0000 |
| commit | ca9b7dd291b73243b21c03c472544387f4886dae (patch) | |
| tree | e5453c73e8c2d7d3c92aeffa5e42894e4e745e39 /chrome/browser/net | |
| parent | c0cfae67ccd13effa179eb2c6ec700f8a1b1d2e3 (diff) | |
| download | chromium_src-ca9b7dd291b73243b21c03c472544387f4886dae.zip chromium_src-ca9b7dd291b73243b21c03c472544387f4886dae.tar.gz chromium_src-ca9b7dd291b73243b21c03c472544387f4886dae.tar.bz2 | |
- USE_NSS instead of LINUX where applicable
- Rename nss_decryptor_linux to nss_decryptor_posix as it's more appropriate
Review URL: http://codereview.chromium.org/656012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
| -rw-r--r-- | chrome/browser/net/chrome_url_request_context.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index 01181bc2..5550496 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -33,7 +33,7 @@ #include "net/url_request/url_request.h" #include "webkit/glue/webkit_glue.h" -#if defined(OS_LINUX) +#if defined(USE_NSS) #include "net/ocsp/nss_ocsp.h" #endif @@ -196,7 +196,7 @@ ChromeURLRequestContext* FactoryForOriginal::Create() { context->set_appcache_service( new ChromeAppCacheService(profile_dir_path_, context)); -#if defined(OS_LINUX) +#if defined(USE_NSS) // TODO(ukai): find a better way to set the URLRequestContext for OCSP. net::SetURLRequestContextForOCSP(context); #endif @@ -613,7 +613,7 @@ ChromeURLRequestContext::~ChromeURLRequestContext() { proxy_service_->SetProxyScriptFetcher(NULL); } -#if defined(OS_LINUX) +#if defined(USE_NSS) if (this == net::GetURLRequestContextForOCSP()) { // We are releasing the URLRequestContext used by OCSP handlers. net::SetURLRequestContextForOCSP(NULL); |