Removes ServiceProviders from ViewManager::Embed

mandoline/ui/browser/merged_service_provider.h

Index: mandoline/ui/browser/merged_service_provider.h
diff --git a/mandoline/ui/browser/merged_service_provider.h b/mandoline/ui/browser/merged_service_provider.h
deleted file mode 100644
index 20a94d5dbe6c0e885a206906e5ed580f627877f6..0000000000000000000000000000000000000000
--- a/mandoline/ui/browser/merged_service_provider.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2015 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 MANDOLINE_UI_BROWSER_MERGED_SERVICE_PROVIDER_H_
-#define MANDOLINE_UI_BROWSER_MERGED_SERVICE_PROVIDER_H_
-
-#include "base/memory/scoped_ptr.h"
-#include "mandoline/services/navigation/public/interfaces/navigation.mojom.h"
-#include "mojo/application/public/cpp/interface_factory.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
-
-namespace mandoline {
-
-// Used to wrap the second incoming WindowManager Embed() "exposed_services"
-// parameter with a new ServiceProvider that adds the Browser's
-// NavigatorHost service.
-class MergedServiceProvider : public mojo::ServiceProvider {
- public:
-  MergedServiceProvider(mojo::ServiceProviderPtr exposed_services,
-                        mojo::InterfaceFactory<mojo::NavigatorHost>* factory);
-  ~MergedServiceProvider() override;
-
-  mojo::ServiceProviderPtr GetServiceProviderPtr();
-
- private:
-  // mojo::ServiceProvider:
-  void ConnectToService(const mojo::String& interface_name,
-                        mojo::ScopedMessagePipeHandle pipe) override;
-
-  mojo::ServiceProviderPtr exposed_services_;
-  mojo::InterfaceFactory<mojo::NavigatorHost>* factory_;
-  scoped_ptr<mojo::Binding<ServiceProvider>> binding_;
-
-  DISALLOW_COPY_AND_ASSIGN(MergedServiceProvider);
-};
-
-}  // namespace mandoline
-
-#endif  // MANDOLINE_UI_BROWSER_MERGED_SERVICE_PROVIDER_H_