Mojo: split up service_provider.mojom

mojo/public/cpp/application/lib/service_registry.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_CPP_APPLICATION_LIB_SERVICE_REGISTRY_H_
 #define MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_REGISTRY_H_
 
 #include "mojo/public/cpp/application/application_connection.h"
-#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
+#include "mojo/public/interfaces/application/service_provider.mojom.h"
 
 namespace mojo {
 
+class Application;
 class ApplicationImpl;
 
 namespace internal {
 
 class ServiceConnectorBase;
 
 // A ServiceRegistry represents each half of a connection between two
 // applications, allowing customization of which services are published to the
 // other.
 class ServiceRegistry : public ServiceProvider, public ApplicationConnection {
@@ skipping 33 matching lines @@
   NameToServiceConnectorMap name_to_service_connector_;
   ServiceProviderPtr remote_service_provider_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceRegistry);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_REGISTRY_H_