diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 21:22:06 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 21:22:06 +0000 |
| commit | 44bf4dcfde06d5531fa1a6b02b855df49db04a06 (patch) | |
| tree | 74b377e66a62690cca47ab5d00fc1e2416945e47 /net | |
| parent | 3b3ae81593831e4057fc5e04ecdbb55adec79836 (diff) | |
| download | chromium_src-44bf4dcfde06d5531fa1a6b02b855df49db04a06.zip chromium_src-44bf4dcfde06d5531fa1a6b02b855df49db04a06.tar.gz chromium_src-44bf4dcfde06d5531fa1a6b02b855df49db04a06.tar.bz2 | |
Reenable #if guards from r110491
r110491 commented the guards to let the builders test the code. This change
reenables them.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/url_request/url_request_http_job.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index a500c7b..5f405cd 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -661,8 +661,7 @@ void URLRequestHttpJob::OnStartCompleted(int result) { // Clear the IO_PENDING status SetStatus(URLRequestStatus()); -// TODO(agl): reenable guards once the builders have checked the code within. -//#if defined(OFFICIAL_BUILD) && !defined(OS_ANDROID) +#if defined(OFFICIAL_BUILD) && !defined(OS_ANDROID) // Take care of any mandates for public key pinning. // // Pinning is only enabled for official builds to make sure that others don't @@ -708,7 +707,7 @@ void URLRequestHttpJob::OnStartCompleted(int result) { } } } -//#endif +#endif if (result == OK) { scoped_refptr<HttpResponseHeaders> headers = GetResponseHeaders(); |