ShellClient -> Service

ipc/ipc_channel_posix.cc

Index: ipc/ipc_channel_posix.cc
diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc
index df7a7589465d93329a5083b60635e48be9592aa3..621b69ef77e569acd8a78bf7c772322d9cda345a 100644
--- a/ipc/ipc_channel_posix.cc
+++ b/ipc/ipc_channel_posix.cc
@@ -364,7 +364,7 @@ bool ChannelPosix::Connect() {
         this);
 #endif
   } else {
-    did_connect = AcceptConnection();
+    did_connect = OnConnect();
   }
   return did_connect;
 }
@@ -632,7 +632,7 @@ void ChannelPosix::OnFileCanReadWithoutBlocking(int fd) {
         << "IPC channels in nacl_helper_nonsfi should not be SERVER mode.";
 #else
     int new_pipe = 0;
-    if (!ServerAcceptConnection(server_listen_pipe_.get(), &new_pipe) ||
+    if (!ServerOnConnect(server_listen_pipe_.get(), &new_pipe) ||
         new_pipe < 0) {
       Close();
       listener()->OnChannelListenError();
@@ -665,7 +665,7 @@ void ChannelPosix::OnFileCanReadWithoutBlocking(int fd) {
       }
     }
 
-    if (!AcceptConnection()) {
+    if (!OnConnect()) {
       NOTREACHED() << "AcceptConnection should not fail on server";
     }
     waiting_connect_ = false;
@@ -768,7 +768,7 @@ bool ChannelPosix::FlushPrelimQueue() {
   return !processing_error;
 }
 
-bool ChannelPosix::AcceptConnection() {
+bool ChannelPosix::OnConnect() {
   base::MessageLoopForIO::current()->WatchFileDescriptor(
       pipe_.get(),
       true,