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

Unified Diff: chrome/browser/devtools/device/adb/mock_adb_server.cc

Issue 2118083002: ShellClient -> Service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus2
Patch Set: . Created 4 years, 5 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
« no previous file with comments | « chrome/browser/chromeos/chrome_interface_factory.cc ('k') | chrome/test/base/mash_browser_tests_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « chrome/browser/chromeos/chrome_interface_factory.cc ('k') | chrome/test/base/mash_browser_tests_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698