Index: net/cert/internal/cert_issuer_source_aia_unittest.cc |
diff --git a/net/cert/internal/cert_issuer_source_aia_unittest.cc b/net/cert/internal/cert_issuer_source_aia_unittest.cc |
index 213208067cd32bff7e192008b43b392a2a2d7eab..b528f03b3c3f7bcf6b8ba4017e364ce09e578dd9 100644 |
--- a/net/cert/internal/cert_issuer_source_aia_unittest.cc |
+++ b/net/cert/internal/cert_issuer_source_aia_unittest.cc |
@@ -6,6 +6,7 @@ |
#include "base/bind.h" |
#include "net/cert/cert_net_fetcher.h" |
+#include "net/cert/internal/cert_issuer_source_test_helpers.h" |
#include "net/cert/internal/parsed_certificate.h" |
#include "net/cert/internal/test_helpers.h" |
#include "testing/gmock/include/gmock/gmock.h" |
@@ -150,11 +151,6 @@ class MockCertNetFetcherImpl : public CertNetFetcher { |
DISALLOW_COPY_AND_ASSIGN(MockCertNetFetcherImpl); |
}; |
-class MockIssuerCallback { |
- public: |
- MOCK_METHOD1(Callback, void(CertIssuerSource::Request*)); |
-}; |
- |
void NotCalled(CertIssuerSource::Request* request) { |
ADD_FAILURE() << "NotCalled was called"; |
} |
@@ -180,7 +176,7 @@ TEST(CertIssuerSourceAiaTest, NoAia) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> request; |
- aia_source.AsyncGetIssuersOf(cert.get(), base::Bind(&NotCalled), &request); |
+ aia_source.AsyncGetIssuersOf(cert, base::Bind(&NotCalled), &request); |
EXPECT_EQ(nullptr, request); |
} |
@@ -197,7 +193,7 @@ TEST(CertIssuerSourceAiaTest, FileAia) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |
@@ -230,7 +226,7 @@ TEST(CertIssuerSourceAiaTest, OneInvalidURL) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> request; |
- aia_source.AsyncGetIssuersOf(cert.get(), base::Bind(&NotCalled), &request); |
+ aia_source.AsyncGetIssuersOf(cert, base::Bind(&NotCalled), &request); |
EXPECT_EQ(nullptr, request); |
} |
@@ -245,7 +241,7 @@ TEST(CertIssuerSourceAiaTest, OneAia) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |
@@ -289,7 +285,7 @@ TEST(CertIssuerSourceAiaTest, OneFileOneHttpAia) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |
@@ -342,7 +338,7 @@ TEST(CertIssuerSourceAiaTest, OneInvalidOneHttpAia) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |
@@ -387,7 +383,7 @@ TEST(CertIssuerSourceAiaTest, TwoAiaCompletedInSeries) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |
@@ -463,7 +459,7 @@ TEST(CertIssuerSourceAiaTest, TwoAiaCompletedBeforeGetNext) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |
@@ -535,7 +531,7 @@ TEST(CertIssuerSourceAiaTest, AiaRequestCompletesDuringGetNextSequence) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |
@@ -611,7 +607,7 @@ TEST(CertIssuerSourceAiaTest, OneAiaHttpError) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |
@@ -645,7 +641,7 @@ TEST(CertIssuerSourceAiaTest, OneAiaParseError) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |
@@ -680,7 +676,7 @@ TEST(CertIssuerSourceAiaTest, TwoAiaCompletedInSeriesFirstFails) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |
@@ -734,7 +730,7 @@ TEST(CertIssuerSourceAiaTest, TwoAiaCompletedInSeriesSecondFails) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |
@@ -792,7 +788,7 @@ TEST(CertIssuerSourceAiaTest, CertSourceRequestCancelled) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |
@@ -828,7 +824,7 @@ TEST(CertIssuerSourceAiaTest, TwoAiaOneCompletedThenRequestCancelled) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |
@@ -879,7 +875,7 @@ TEST(CertIssuerSourceAiaTest, MaxFetchesPerCert) { |
StrictMock<MockCertNetFetcherImpl> mock_fetcher; |
CertIssuerSourceAia aia_source(&mock_fetcher); |
std::unique_ptr<CertIssuerSource::Request> cert_source_request; |
- aia_source.AsyncGetIssuersOf(cert.get(), |
+ aia_source.AsyncGetIssuersOf(cert, |
base::Bind(&MockIssuerCallback::Callback, |
base::Unretained(&mock_callback)), |
&cert_source_request); |