Rename shell namespace to service_manager

mash/app_driver/app_driver.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mash/app_driver/app_driver.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 68 matching lines @@
       base::Bind(&AppDriver::AddAccelerators, weak_factory_.GetWeakPtr()));
 
   for (const AcceleratorSpec& spec : g_spec) {
     registrar->AddAccelerator(
         static_cast<uint32_t>(spec.id),
         ui::CreateKeyMatcher(spec.keyboard_code, spec.event_flags),
         base::Bind(&AssertTrue));
   }
 }
 
-void AppDriver::OnStart(const shell::Identity& identity) {
+void AppDriver::OnStart(const service_manager::Identity& identity) {
   AddAccelerators();
 }
 
-bool AppDriver::OnConnect(const shell::Identity& remote_identity,
-                          shell::InterfaceRegistry* registry) {
+bool AppDriver::OnConnect(const service_manager::Identity& remote_identity,
+                          service_manager::InterfaceRegistry* registry) {
   return true;
 }
 
 bool AppDriver::OnStop() {
   // Prevent the code in AddAccelerators() from keeping this app alive.
   if (binding_.is_bound())
     binding_.set_connection_error_handler(base::Bind(&DoNothing));
   return true;
 }
 
@@ skipping 25 matching lines @@
 
 void AppDriver::AddAccelerators() {
   connector()->ConnectToInterface("service:catalog", &catalog_);
   catalog_->GetEntriesProvidingClass(
       "mus:window_manager", base::Bind(&AppDriver::OnAvailableCatalogEntries,
                                        weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace app_driver
 }  // namespace mash