Remove [Client=] annotation from ServiceProvider

mojo/services/view_manager/public/cpp/lib/view.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.h"
 
 #include <set>
 
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "view_manager/public/cpp/lib/view_manager_client_impl.h"
@@ skipping 341 matching lines @@
 
 void View::SetFocus() {
   if (manager_)
     static_cast<ViewManagerClientImpl*>(manager_)->SetFocus(id_);
 }
 
 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());
-  }
+void View::Embed(const String& url,
+                 InterfaceRequest<ServiceProvider> services,
+                 ServiceProviderPtr exposed_services) {
   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) {
-  static_cast<ViewManagerClientImpl*>(manager_)
-      ->Embed(url, id_, exported_services.Pass());
+      ->Embed(url, id_, services.Pass(), exposed_services.Pass());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // View, protected:
 
 View::View()
     : manager_(NULL),
       id_(static_cast<Id>(-1)),
       parent_(NULL),
       visible_(true),
@@ skipping 156 matching lines @@
 void View::NotifyViewVisibilityChangedUp(View* target) {
   // Start with the parent as we already notified |this|
   // in NotifyViewVisibilityChangedDown.
   for (View* view = parent(); view; view = view->parent()) {
     bool ret = view->NotifyViewVisibilityChangedAtReceiver(target);
     DCHECK(ret);
   }
 }
 
 }  // namespace mojo