| Index: net/socket/ssl_client_socket_unittest.cc
|
| diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
|
| index 3975abe4113344747ec1953a79728943b5c01062..8d5512d0a381648dec849b58a5f10fa8d176a618 100644
|
| --- a/net/socket/ssl_client_socket_unittest.cc
|
| +++ b/net/socket/ssl_client_socket_unittest.cc
|
| @@ -100,7 +100,9 @@ class WrappedStreamSocket : public StreamSocket {
|
| int GetLocalAddress(IPEndPoint* address) const override {
|
| return transport_->GetLocalAddress(address);
|
| }
|
| - const BoundNetLog& NetLog() const override { return transport_->NetLog(); }
|
| + const NetLogWithSource& NetLog() const override {
|
| + return transport_->NetLog();
|
| + }
|
| void SetSubresourceSpeculation() override {
|
| transport_->SetSubresourceSpeculation();
|
| }
|
| @@ -691,11 +693,12 @@ class AsyncFailingChannelIDStore : public ChannelIDStore {
|
| // anything.
|
| class MockCTVerifier : public CTVerifier {
|
| public:
|
| - MOCK_METHOD5(Verify, int(X509Certificate*,
|
| - const std::string&,
|
| - const std::string&,
|
| - ct::CTVerifyResult*,
|
| - const BoundNetLog&));
|
| + MOCK_METHOD5(Verify,
|
| + int(X509Certificate*,
|
| + const std::string&,
|
| + const std::string&,
|
| + ct::CTVerifyResult*,
|
| + const NetLogWithSource&));
|
| MOCK_METHOD1(SetObserver, void(CTVerifier::Observer*));
|
| };
|
|
|
| @@ -705,12 +708,12 @@ class MockCTPolicyEnforcer : public CTPolicyEnforcer {
|
| MOCK_METHOD3(DoesConformToCertPolicy,
|
| ct::CertPolicyCompliance(X509Certificate* cert,
|
| const ct::SCTList&,
|
| - const BoundNetLog&));
|
| + const NetLogWithSource&));
|
| MOCK_METHOD4(DoesConformToCTEVPolicy,
|
| ct::EVPolicyCompliance(X509Certificate* cert,
|
| const ct::EVCertsWhitelist*,
|
| const ct::SCTList&,
|
| - const BoundNetLog&));
|
| + const NetLogWithSource&));
|
| };
|
|
|
| class MockRequireCTDelegate : public TransportSecurityState::RequireCTDelegate {
|
|
|