Remove [Client=] annotation from ServiceProvider

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

Index: mojo/services/view_manager/public/cpp/lib/view.cc
diff --git a/mojo/services/view_manager/public/cpp/lib/view.cc b/mojo/services/view_manager/public/cpp/lib/view.cc
index 6848a316ffc220330b4af73ba81ae8ba2a9f7239..929eec494576ed14f25ab746a8b19d023e293074 100644
--- a/mojo/services/view_manager/public/cpp/lib/view.cc
+++ b/mojo/services/view_manager/public/cpp/lib/view.cc
@@ -359,26 +359,11 @@ void View::Embed(const String& url) {
   static_cast<ViewManagerClientImpl*>(manager_)->Embed(url, id_);
 }
 
-scoped_ptr<ServiceProvider>
-    View::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());
-  }
-  static_cast<ViewManagerClientImpl*>(manager_)
-      ->Embed(url, id_, MakeRequest<ServiceProvider>(sp.PassMessagePipe()));
-  return imported_services.Pass();
-}
-
 void View::Embed(const String& url,
-                 InterfaceRequest<ServiceProvider> exported_services) {
+                 InterfaceRequest<ServiceProvider> services,
+                 ServiceProviderPtr exposed_services) {
   static_cast<ViewManagerClientImpl*>(manager_)
-      ->Embed(url, id_, exported_services.Pass());
+      ->Embed(url, id_, services.Pass(), exposed_services.Pass());
 }
 
 ////////////////////////////////////////////////////////////////////////////////