Fork the mojo shell interfaces used by Mandoline.

mojo/application/public/cpp/service_provider_impl.h

Index: mojo/application/public/cpp/service_provider_impl.h
diff --git a/third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h b/mojo/application/public/cpp/service_provider_impl.h
similarity index 79%
rename from third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h
rename to mojo/application/public/cpp/service_provider_impl.h
index ed4de3a9312f32b18f989b92f4bce69f8a5e70ed..033bdaca9713543e7ab6e5cdc5888d2980a0a201 100644
--- a/third_party/mojo/src/mojo/public/cpp/application/service_provider_impl.h
+++ b/mojo/application/public/cpp/service_provider_impl.h
@@ -2,15 +2,15 @@
 // 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 {
 
@@ -50,4 +50,4 @@ class ServiceProviderImpl : public ServiceProvider {
 
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_APPLICATION_SERVICE_PROVIDER_IMPL_H_
+#endif  // MOJO_APPLICATION_PUBLIC_CPP_SERVICE_PROVIDER_IMPL_H_