Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(495)

Unified Diff: net/socket/transport_client_socket_pool_test_util.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/socket/transport_client_socket_pool_test_util.cc
diff --git a/net/socket/transport_client_socket_pool_test_util.cc b/net/socket/transport_client_socket_pool_test_util.cc
index 2577bc6de3f6a630113c28428818334a21d9cd9c..3c02384053b91423e2e08680086e3f70a25c8b59 100644
--- a/net/socket/transport_client_socket_pool_test_util.cc
+++ b/net/socket/transport_client_socket_pool_test_util.cc
@@ -41,7 +41,7 @@ class MockConnectClientSocket : public StreamSocket {
MockConnectClientSocket(const AddressList& addrlist, net::NetLog* net_log)
: connected_(false),
addrlist_(addrlist),
- net_log_(BoundNetLog::Make(net_log, NetLogSourceType::SOCKET)) {}
+ net_log_(NetLogWithSource::Make(net_log, NetLogSourceType::SOCKET)) {}
// StreamSocket implementation.
int Connect(const CompletionCallback& callback) override {
@@ -65,7 +65,7 @@ class MockConnectClientSocket : public StreamSocket {
SetIPv6Address(address);
return OK;
}
- const BoundNetLog& NetLog() const override { return net_log_; }
+ const NetLogWithSource& NetLog() const override { return net_log_; }
void SetSubresourceSpeculation() override {}
void SetOmniboxSpeculation() override {}
@@ -101,7 +101,7 @@ class MockConnectClientSocket : public StreamSocket {
private:
bool connected_;
const AddressList addrlist_;
- BoundNetLog net_log_;
+ NetLogWithSource net_log_;
DISALLOW_COPY_AND_ASSIGN(MockConnectClientSocket);
};
@@ -110,7 +110,7 @@ class MockFailingClientSocket : public StreamSocket {
public:
MockFailingClientSocket(const AddressList& addrlist, net::NetLog* net_log)
: addrlist_(addrlist),
- net_log_(BoundNetLog::Make(net_log, NetLogSourceType::SOCKET)) {}
+ net_log_(NetLogWithSource::Make(net_log, NetLogSourceType::SOCKET)) {}
// StreamSocket implementation.
int Connect(const CompletionCallback& callback) override {
@@ -127,7 +127,7 @@ class MockFailingClientSocket : public StreamSocket {
int GetLocalAddress(IPEndPoint* address) const override {
return ERR_UNEXPECTED;
}
- const BoundNetLog& NetLog() const override { return net_log_; }
+ const NetLogWithSource& NetLog() const override { return net_log_; }
void SetSubresourceSpeculation() override {}
void SetOmniboxSpeculation() override {}
@@ -165,7 +165,7 @@ class MockFailingClientSocket : public StreamSocket {
private:
const AddressList addrlist_;
- BoundNetLog net_log_;
+ NetLogWithSource net_log_;
DISALLOW_COPY_AND_ASSIGN(MockFailingClientSocket);
};
@@ -180,7 +180,7 @@ class MockTriggerableClientSocket : public StreamSocket {
: should_connect_(should_connect),
is_connected_(false),
addrlist_(addrlist),
- net_log_(BoundNetLog::Make(net_log, NetLogSourceType::SOCKET)),
+ net_log_(NetLogWithSource::Make(net_log, NetLogSourceType::SOCKET)),
weak_factory_(this) {}
// Call this method to get a closure which will trigger the connect callback
@@ -253,7 +253,7 @@ class MockTriggerableClientSocket : public StreamSocket {
SetIPv6Address(address);
return OK;
}
- const BoundNetLog& NetLog() const override { return net_log_; }
+ const NetLogWithSource& NetLog() const override { return net_log_; }
void SetSubresourceSpeculation() override {}
void SetOmniboxSpeculation() override {}
@@ -299,7 +299,7 @@ class MockTriggerableClientSocket : public StreamSocket {
bool should_connect_;
bool is_connected_;
const AddressList addrlist_;
- BoundNetLog net_log_;
+ NetLogWithSource net_log_;
CompletionCallback callback_;
ConnectionAttempts connection_attempts_;

Powered by Google App Engine
This is Rietveld 408576698