summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 22:41:02 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-24 22:41:02 +0000
commitd6cfe0d1947ed7343ef931358be793413fa559b8 (patch)
treea154de01d392db1031225ae82c7a793503fdc671 /net
parent706640aae5285ff0843cd038777616ca85525cce (diff)
downloadchromium_src-d6cfe0d1947ed7343ef931358be793413fa559b8.zip
chromium_src-d6cfe0d1947ed7343ef931358be793413fa559b8.tar.gz
chromium_src-d6cfe0d1947ed7343ef931358be793413fa559b8.tar.bz2
Remove two CHECKs that were added to help track down the crash
in http://crbug.com/49862. That crash no longer occurs. Fix cpplint.py nit: add a "// namespace" comment. R=vandebo BUG=49862 TEST=none Review URL: http://codereview.chromium.org/3165057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/http/http_stream_request.cc7
-rw-r--r--net/socket/ssl_client_socket_nss.cc2
2 files changed, 2 insertions, 7 deletions
diff --git a/net/http/http_stream_request.cc b/net/http/http_stream_request.cc
index de7554b..6ee73d2 100644
--- a/net/http/http_stream_request.cc
+++ b/net/http/http_stream_request.cc
@@ -36,7 +36,7 @@ GURL UpgradeUrlToHttps(const GURL& original_url) {
return original_url.ReplaceComponents(replacements);
}
-}
+} // namespace
HttpStreamRequest::HttpStreamRequest(
HttpStreamFactory* factory,
@@ -620,11 +620,8 @@ int HttpStreamRequest::DoInitConnectionComplete(int result) {
return OK;
}
- if (result < 0 && !ssl_started) {
- // A temporary CHECK for tracking down http://crbug.com/49862.
- CHECK(!IsCertificateError(result));
+ if (result < 0 && !ssl_started)
return ReconsiderProxyAfterError(result);
- }
establishing_tunnel_ = false;
if (connection_->socket()) {
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index c676c08..7b23b26 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -817,8 +817,6 @@ void SSLClientSocketNSS::CheckSecureRenegotiation() const {
void SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) {
EnterFunction("");
ssl_info->Reset();
- // A temporary CHECK for tracking down http://crbug.com/49862.
- CHECK(server_cert_);
if (!server_cert_)
return;