Move services/shell to services/service_manager

content/public/common/service_manager_connection.h

 // Copyright 2016 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_SERVICE_MANAGER_CONNECTION_H_
 #define CONTENT_PUBLIC_COMMON_SERVICE_MANAGER_CONNECTION_H_
 
 #include <memory>
 
 #include "base/callback_forward.h"
 #include "base/sequenced_task_runner.h"
 #include "content/common/content_export.h"
 #include "content/public/common/service_info.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
 
 namespace shell {
 class Connection;
 class Connector;
 class InterfaceProvider;
 class InterfaceRegistry;
 }
 
 namespace content {
 
 class ConnectionFilter;
 
-// Encapsulates a connection to a //services/shell.
+// Encapsulates a connection to a //services/service_manager.
 // Access a global instance on the thread the ServiceContext was bound by
 // calling Holder::Get().
 // Clients can add shell::Service implementations whose exposed interfaces
 // will be exposed to inbound connections to this object's Service.
 // Alternatively clients can define named services that will be constructed when
 // requests for those service names are received.
 // Clients must call any of the registration methods when receiving
 // ContentBrowserClient::RegisterInProcessServices().
 class CONTENT_EXPORT ServiceManagerConnection {
  public:
@@ skipping 100 matching lines @@
   // For in-process services, it is preferable to use |AddEmbeddedService()| as
   // defined above.
   virtual void AddServiceRequestHandler(
       const std::string& name,
       const ServiceRequestHandler& handler) = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_SERVICE_MANAGER_CONNECTION_H_