summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/devtools/tethering_handler.cc5
-rw-r--r--content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc6
2 files changed, 3 insertions, 8 deletions
diff --git a/content/browser/devtools/tethering_handler.cc b/content/browser/devtools/tethering_handler.cc
index 5c33231..fc25e63 100644
--- a/content/browser/devtools/tethering_handler.cc
+++ b/content/browser/devtools/tethering_handler.cc
@@ -191,7 +191,6 @@ class TetheringHandler::BoundSocket {
return false;
net::IPEndPoint end_point(ip_number, port);
- socket_->AllowAddressReuse();
int result = socket_->Listen(end_point, kListenBacklog);
if (result < 0)
return false;
@@ -254,8 +253,8 @@ TetheringHandler::TetheringHandler(DevToolsHttpHandlerDelegate* delegate)
}
TetheringHandler::~TetheringHandler() {
- STLDeleteContainerPairSecondPointers(bound_sockets_.begin(),
- bound_sockets_.end());
+ STLDeleteContainerPairSecondPointers(bound_sockets_.begin(),
+ bound_sockets_.end());
}
void TetheringHandler::Accepted(int port, const std::string& name) {
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc b/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc
index 6bca738..9eba741 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc
@@ -45,10 +45,6 @@ class FakeServerSocket : public net::ServerSocket {
}
}
- // net::ServerSocket implementation.
- virtual void AllowAddressReuse() OVERRIDE {
- }
-
virtual int Listen(const net::IPEndPoint& address, int backlog) OVERRIDE {
local_address_ = address;
listening_ = true;
@@ -113,7 +109,7 @@ class P2PSocketHostTcpServerTest : public testing::Test {
}
MockIPCSender sender_;
- FakeServerSocket* socket_; // Owned by |socket_host_|.
+ FakeServerSocket* socket_; // Owned by |socket_host_|.
scoped_ptr<P2PSocketHostTcpServer> socket_host_;
};