Fix content/shell including internals of content for service worker test.

content/public/common/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 CONTENT_PUBLIC_COMMON_SERVICE_REGISTRY_H_
 #define CONTENT_PUBLIC_COMMON_SERVICE_REGISTRY_H_
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string_piece.h"
 #include "content/common/content_export.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/system/core.h"
+#include "services/shell/public/interfaces/interface_provider.mojom.h"
 
 namespace content {
 
 // A ServiceRegistry exposes local services that have been added using
 // AddService to a paired remote ServiceRegistry and provides local access to
 // services exposed by the remote ServiceRegistry through
 // ConnectToRemoteService.
 class CONTENT_EXPORT ServiceRegistry {
  public:
+  static ServiceRegistry* Create();
   virtual ~ServiceRegistry() {}
 
+  // Binds this ServiceProvider implementation to a message pipe endpoint.
+  virtual void Bind(shell::mojom::InterfaceProviderRequest request) = 0;
+
+  // Binds to a remote ServiceProvider. This will expose added services to the
+  // remote ServiceProvider with the corresponding handle and enable
+  // ConnectToRemoteService to provide access to services exposed by the remote
+  // ServiceProvider.
+  virtual void BindRemoteServiceProvider(
+      shell::mojom::InterfaceProviderPtr service_provider) = 0;
+
   // Make the service created by |service_factory| available to the remote
   // ServiceProvider. In response to each request for a service,
   // |service_factory| will be run with an InterfaceRequest<Interface>
   // representing that request. Adding a factory for an already registered
   // service will override the factory. Existing connections to the service are
   // unaffected.
   template <typename Interface>
   void AddService(const base::Callback<void(mojo::InterfaceRequest<Interface>)>
                       service_factory) {
     AddService(Interface::Name_,
@@ skipping 39 matching lines @@
       const base::Callback<void(mojo::InterfaceRequest<Interface>)>
           service_factory,
       mojo::ScopedMessagePipeHandle handle) {
     service_factory.Run(mojo::MakeRequest<Interface>(std::move(handle)));
   }
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_SERVICE_REGISTRY_H_