ShellClient -> Service

mash/app_driver/app_driver.cc

Index: mash/app_driver/app_driver.cc
diff --git a/mash/app_driver/app_driver.cc b/mash/app_driver/app_driver.cc
index 008506d5d2ad78ee3479fd44afee611261979ecc..4947911b3c28975665c8f0574ad094cc91a4ded4 100644
--- a/mash/app_driver/app_driver.cc
+++ b/mash/app_driver/app_driver.cc
@@ -85,18 +85,18 @@ void AppDriver::OnAvailableCatalogEntries(
   }
 }
 
-void AppDriver::Initialize(shell::Connector* connector,
-                           const shell::Identity& identity,
-                           uint32_t id) {
+void AppDriver::OnStart(shell::Connector* connector,
+                        const shell::Identity& identity,
+                        uint32_t id) {
   connector_ = connector;
   AddAccelerators();
 }
 
-bool AppDriver::AcceptConnection(shell::Connection* connection) {
+bool AppDriver::OnConnect(shell::Connection* connection) {
   return true;
 }
 
-bool AppDriver::ShellConnectionLost() {
+bool AppDriver::OnStop() {
   // Prevent the code in AddAccelerators() from keeping this app alive.
   binding_.set_connection_error_handler(base::Bind(&DoNothing));
   return true;