Fork the mojo shell interfaces used by Mandoline.

mojo/application/public/cpp/service_provider_impl.h

 // Copyright 2014 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 MOJO_PUBLIC_APPLICATION_SERVICE_PROVIDER_IMPL_H_
-#define MOJO_PUBLIC_APPLICATION_SERVICE_PROVIDER_IMPL_H_
+#ifndef MOJO_APPLICATION_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
+#define MOJO_APPLICATION_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_
 
 #include <string>
 
-#include "mojo/public/cpp/application/lib/interface_factory_connector.h"
-#include "mojo/public/cpp/application/lib/service_connector_registry.h"
+#include "mojo/application/public/cpp/lib/interface_factory_connector.h"
+#include "mojo/application/public/cpp/lib/service_connector_registry.h"
+#include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/public/interfaces/application/service_provider.mojom.h"
 
 namespace mojo {
 
 // Implements a registry that can be used to expose services to another app.
 class ServiceProviderImpl : public ServiceProvider {
  public:
   ServiceProviderImpl();
   explicit ServiceProviderImpl(InterfaceRequest<ServiceProvider> request);
   ~ServiceProviderImpl() override;
 
@@ skipping 19 matching lines @@
 
   Binding<ServiceProvider> binding_;
 
   internal::ServiceConnectorRegistry service_connector_registry_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceProviderImpl);
 };
 
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_APPLICATION_SERVICE_PROVIDER_IMPL_H_
+#endif  // MOJO_APPLICATION_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_