diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-01 00:39:50 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-01 00:39:50 +0000 |
| commit | 90499486eb26f12da3456f01bd28abc4a6191ea4 (patch) | |
| tree | aa97aa55048b94b328a11621f0dc73a2622c06e8 /net/ocsp | |
| parent | a9030b828efc3b1312264875c1f76b35708eb000 (diff) | |
| download | chromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.zip chromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.tar.gz chromium_src-90499486eb26f12da3456f01bd28abc4a6191ea4.tar.bz2 | |
Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/15829004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203535 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ocsp')
| -rw-r--r-- | net/ocsp/nss_ocsp.cc | 4 | ||||
| -rw-r--r-- | net/ocsp/nss_ocsp_unittest.cc | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc index 350cdc9..55ac036 100644 --- a/net/ocsp/nss_ocsp.cc +++ b/net/ocsp/nss_ocsp.cc @@ -300,7 +300,7 @@ class OCSPRequestSession response_code_ = request_->GetResponseCode(); response_headers_ = request_->response_headers(); response_headers_->GetMimeType(&response_content_type_); - request_->Read(buffer_, kRecvBufferSize, &bytes_read); + request_->Read(buffer_.get(), kRecvBufferSize, &bytes_read); } OnReadCompleted(request_, bytes_read); } @@ -314,7 +314,7 @@ class OCSPRequestSession if (!request_->status().is_success() || bytes_read <= 0) break; data_.append(buffer_->data(), bytes_read); - } while (request_->Read(buffer_, kRecvBufferSize, &bytes_read)); + } while (request_->Read(buffer_.get(), kRecvBufferSize, &bytes_read)); if (!request_->status().is_io_pending()) { delete request_; diff --git a/net/ocsp/nss_ocsp_unittest.cc b/net/ocsp/nss_ocsp_unittest.cc index 076e9bd..be29d5f 100644 --- a/net/ocsp/nss_ocsp_unittest.cc +++ b/net/ocsp/nss_ocsp_unittest.cc @@ -73,8 +73,7 @@ class NssHttpTest : public ::testing::Test { : context_(false), handler_(NULL), verify_proc_(new CertVerifyProcNSS), - verifier_(new MultiThreadedCertVerifier(verify_proc_)) { - } + verifier_(new MultiThreadedCertVerifier(verify_proc_.get())) {} virtual ~NssHttpTest() {} virtual void SetUp() { @@ -136,16 +135,21 @@ TEST_F(NssHttpTest, TestAia) { ImportCertFromFile(GetTestCertsDirectory(), "aia-root.pem")); ASSERT_TRUE(test_root.get()); - ScopedTestRoot scoped_root(test_root); + ScopedTestRoot scoped_root(test_root.get()); CertVerifyResult verify_result; TestCompletionCallback test_callback; CertVerifier::RequestHandle request_handle; int flags = CertVerifier::VERIFY_CERT_IO_ENABLED; - int error = verifier()->Verify(test_cert, "aia-host.invalid", flags, NULL, - &verify_result, test_callback.callback(), - &request_handle, BoundNetLog()); + int error = verifier()->Verify(test_cert.get(), + "aia-host.invalid", + flags, + NULL, + &verify_result, + test_callback.callback(), + &request_handle, + BoundNetLog()); ASSERT_EQ(ERR_IO_PENDING, error); error = test_callback.WaitForResult(); |