diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 20:40:07 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 20:40:07 +0000 |
| commit | e88485cab6969203a71321dde29373ca13f229dd (patch) | |
| tree | bc9b35c879fe27624a9d8c05c421e1e0da5ecaaa | |
| parent | b03481d2bce4b9a82acac1b9a90fce1ffd8fb2f3 (diff) | |
| download | chromium_src-e88485cab6969203a71321dde29373ca13f229dd.zip chromium_src-e88485cab6969203a71321dde29373ca13f229dd.tar.gz chromium_src-e88485cab6969203a71321dde29373ca13f229dd.tar.bz2 | |
Reenable #if guards around pinning checks.
They were removed in r109464 to allow the builders to test that change.
BUG=103368
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109497 0039d316-1c4b-4281-b951-d872f2087c98
| -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 5fd305a..bebe42c 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -660,8 +660,7 @@ void URLRequestHttpJob::OnStartCompleted(int result) { // Clear the IO_PENDING status SetStatus(URLRequestStatus()); -// #if guard removed temporarily in order to let the builders test this code. -//#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 @@ -699,7 +698,7 @@ void URLRequestHttpJob::OnStartCompleted(int result) { } } } -//#endif +#endif if (result == OK) { scoped_refptr<HttpResponseHeaders> headers = GetResponseHeaders(); |