Move services/shell to services/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"
 #include "mash/public/interfaces/launchable.mojom.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/common/event_matcher_util.h"
 
 using mash::mojom::LaunchablePtr;
 using mash::mojom::LaunchMode;
 
 namespace mash {
 namespace app_driver {
 namespace {
 
 const char kBrowserServiceName[] = "service:content_browser";
@@ skipping 106 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