diff options
Diffstat (limited to 'net/http')
-rw-r--r-- | net/http/http_network_transaction_unittest.cc | 2 | ||||
-rw-r--r-- | net/http/http_response_info.cc | 6 | ||||
-rw-r--r-- | net/http/http_transaction_unittest.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index b66c269..81b8718 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -4227,7 +4227,7 @@ TEST_F(HttpNetworkTransactionTest, ResetStateForRestart) { // Setup state in response_ HttpResponseInfo* response = &trans->response_; response->auth_challenge = new AuthChallengeInfo(); - response->ssl_info.cert_status = -15; + response->ssl_info.cert_status = static_cast<CertStatus>(-1); // Nonsensical. response->response_time = base::Time::Now(); response->was_cached = true; // (Wouldn't ever actually be true...) diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc index a99990b..2496731 100644 --- a/net/http/http_response_info.cc +++ b/net/http/http_response_info.cc @@ -151,8 +151,8 @@ bool HttpResponseInfo::InitFromPickle(const Pickle& pickle, return false; } if (flags & RESPONSE_INFO_HAS_CERT_STATUS) { - int cert_status; - if (!pickle.ReadInt(&iter, &cert_status)) + CertStatus cert_status; + if (!pickle.ReadUInt32(&iter, &cert_status)) return false; ssl_info.cert_status = cert_status; } @@ -244,7 +244,7 @@ void HttpResponseInfo::Persist(Pickle* pickle, if (ssl_info.is_valid()) { ssl_info.cert->Persist(pickle); - pickle->WriteInt(ssl_info.cert_status); + pickle->WriteUInt32(ssl_info.cert_status); if (ssl_info.security_bits != -1) pickle->WriteInt(ssl_info.security_bits); if (ssl_info.connection_status != 0) diff --git a/net/http/http_transaction_unittest.h b/net/http/http_transaction_unittest.h index 714f263..fa6572a 100644 --- a/net/http/http_transaction_unittest.h +++ b/net/http/http_transaction_unittest.h @@ -62,7 +62,7 @@ struct MockTransaction { const char* data; int test_mode; MockTransactionHandler handler; - int cert_status; + net::CertStatus cert_status; }; extern const MockTransaction kSimpleGET_Transaction; |