Remove [Client=] annotation from ServiceProvider

mojo/services/view_manager/public/cpp/view.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 MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
 #define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 106 matching lines @@
 
   View* GetChildById(Id id);
 
   void SetSurfaceId(SurfaceIdPtr id);
 
   // Focus.
   void SetFocus();
 
   // Embedding.
   void Embed(const String& url);
-  scoped_ptr<ServiceProvider> Embed(
-      const String& url,
-      scoped_ptr<ServiceProviderImpl> exported_services);
   void Embed(const String& url,
-             InterfaceRequest<ServiceProvider> service_provider);
+             InterfaceRequest<ServiceProvider> services,
+             ServiceProviderPtr exposed_services);
 
  protected:
   // This class is subclassed only by test classes that provide a public ctor.
   View();
   ~View();
 
  private:
   friend class ViewPrivate;
   friend class ViewManagerClientImpl;
 
@@ skipping 55 matching lines @@
   };
 
   std::map<const void*, Value> prop_map_;
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_