| Index: chrome/browser/devtools/device/adb/mock_adb_server.cc
|
| diff --git a/chrome/browser/devtools/device/adb/mock_adb_server.cc b/chrome/browser/devtools/device/adb/mock_adb_server.cc
|
| index bfc7af5e7eda764223f5cad0b13ae85a40ebc22b..8008ffd1383da3c8577205e2c74fa097e53faf0c 100644
|
| --- a/chrome/browser/devtools/device/adb/mock_adb_server.cc
|
| +++ b/chrome/browser/devtools/device/adb/mock_adb_server.cc
|
| @@ -219,7 +219,7 @@ class SimpleHttpServer : base::NonThreadSafe {
|
| DISALLOW_COPY_AND_ASSIGN(Connection);
|
| };
|
|
|
| - void AcceptConnection();
|
| + void OnConnect();
|
| void OnAccepted(int result);
|
|
|
| ParserFactory factory_;
|
| @@ -236,7 +236,7 @@ SimpleHttpServer::SimpleHttpServer(const ParserFactory& factory,
|
| socket_(new net::TCPServerSocket(nullptr, net::NetLog::Source())),
|
| weak_factory_(this) {
|
| socket_->Listen(endpoint, 5);
|
| - AcceptConnection();
|
| + OnConnect();
|
| }
|
|
|
| SimpleHttpServer::~SimpleHttpServer() {
|
| @@ -364,7 +364,7 @@ void SimpleHttpServer::Connection::OnDataWritten(int count) {
|
| delete this;
|
| }
|
|
|
| -void SimpleHttpServer::AcceptConnection() {
|
| +void SimpleHttpServer::OnConnect() {
|
| CHECK(CalledOnValidThread());
|
|
|
| int accept_result = socket_->Accept(&client_socket_,
|
| @@ -380,7 +380,7 @@ void SimpleHttpServer::OnAccepted(int result) {
|
| CHECK(CalledOnValidThread());
|
| ASSERT_EQ(result, 0); // Fails if the socket is already in use.
|
| new Connection(client_socket_.release(), factory_);
|
| - AcceptConnection();
|
| + OnConnect();
|
| }
|
|
|
| class AdbParser : public SimpleHttpServer::Parser,
|
|
|