Remove [Client=] annotation from ServiceProvider

mojo/services/view_manager/public/cpp/lib/view_manager_context.cc

 // 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.
 
 #include "view_manager/public/cpp/view_manager_context.h"
 
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "window_manager/public/interfaces/window_manager.mojom.h"
 
@@ skipping 13 matching lines @@
   WindowManagerPtr wm_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(InternalState);
 };
 
 ViewManagerContext::ViewManagerContext(ApplicationImpl* application_impl)
     : state_(new InternalState(application_impl)) {}
 ViewManagerContext::~ViewManagerContext() {}
 
 void ViewManagerContext::Embed(const String& url) {
-  scoped_ptr<ServiceProviderImpl> spi(new ServiceProviderImpl);
-  Embed(url, spi.Pass());
+  Embed(url, nullptr, nullptr);
 }
 
-scoped_ptr<ServiceProvider> ViewManagerContext::Embed(
-    const String& url,
-    scoped_ptr<ServiceProviderImpl> exported_services) {
-  scoped_ptr<ServiceProvider> imported_services;
-  // BindToProxy() takes ownership of |exported_services|.
-  ServiceProviderImpl* registry = exported_services.release();
-  ServiceProviderPtr sp;
-  if (registry) {
-    BindToProxy(registry, &sp);
-    imported_services.reset(registry->CreateRemoteServiceProvider());
-  }
-  state_->wm()->Embed(url, MakeRequest<ServiceProvider>(sp.PassMessagePipe()));
-  return imported_services.Pass();
+void ViewManagerContext::Embed(const String& url,
+                               InterfaceRequest<ServiceProvider> services,
+                               ServiceProviderPtr exposed_services) {
+  state_->wm()->Embed(url, services.Pass(), exposed_services.Pass());
 }
 
 }  // namespace mojo