Remove [Client=] annotation from ServiceProvider

mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.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/lib/view_manager_client_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/public/cpp/application/application_impl.h"
@@ skipping 177 matching lines @@
     const std::string& name,
     const std::vector<uint8_t>& data) {
   DCHECK(connected_);
   service_->SetViewProperty(view_id,
                             String(name),
                             Array<uint8_t>::From(data),
                             ActionCompletedCallback());
 }
 
 void ViewManagerClientImpl::Embed(const String& url, Id view_id) {
-  MessagePipe pipe;
-  InterfaceRequest<ServiceProvider> request;
-  request.Bind(pipe.handle0.Pass());
-  Embed(url, view_id, request.Pass());
+  Embed(url, view_id, nullptr, nullptr);
 }
 
-void ViewManagerClientImpl::Embed(
-    const String& url,
-    Id view_id,
-    InterfaceRequest<ServiceProvider> service_provider) {
+void ViewManagerClientImpl::Embed(const String& url,
+                                  Id view_id,
+                                  InterfaceRequest<ServiceProvider> services,
+                                  ServiceProviderPtr exposed_services) {
   DCHECK(connected_);
-  service_->Embed(url, view_id, service_provider.Pass(),
+  service_->Embed(url, view_id, services.Pass(), exposed_services.Pass(),
                   ActionCompletedCallback());
 }
 
 void ViewManagerClientImpl::AddView(View* view) {
   DCHECK(views_.find(view->id()) == views_.end());
   views_[view->id()] = view;
 }
 
 void ViewManagerClientImpl::RemoveView(Id view_id) {
   IdToViewMap::iterator it = views_.find(view_id);
@@ skipping 34 matching lines @@
   return view;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ViewManagerClientImpl, ViewManagerClient implementation:
 
 void ViewManagerClientImpl::OnEmbed(
     ConnectionSpecificId connection_id,
     const String& creator_url,
     ViewDataPtr root_data,
-    InterfaceRequest<ServiceProvider> parent_services,
+    InterfaceRequest<ServiceProvider> services,
+    ServiceProviderPtr exposed_services,
     ScopedMessagePipeHandle window_manager_pipe) {
   DCHECK(!connected_);
   connected_ = true;
   connection_id_ = connection_id;
   creator_url_ = String::From(creator_url);
 
   DCHECK(!root_);
   root_ = AddViewToViewManager(this, nullptr, root_data);
   root_->AddObserver(new RootObserver(root_));
 
-  ServiceProviderImpl* exported_services = nullptr;
-  scoped_ptr<ServiceProvider> remote;
-
-  // BindToRequest() binds the lifetime of |exported_services| to the pipe.
-  exported_services = new ServiceProviderImpl;
-  BindToRequest(exported_services, &parent_services);
-  remote.reset(exported_services->CreateRemoteServiceProvider());
-
   window_manager_.Bind(window_manager_pipe.Pass());
   window_manager_.set_client(this);
   // base::Unretained() is safe here as |window_manager_| is bound to our
   // lifetime.
   window_manager_->GetFocusedAndActiveViews(
       base::Bind(&ViewManagerClientImpl::OnGotFocusedAndActiveViews,
                  base::Unretained(this)));
-  delegate_->OnEmbed(root_, exported_services, remote.Pass());
+
+  delegate_->OnEmbed(root_, services.Pass(), exposed_services.Pass());
 }
 
 void ViewManagerClientImpl::OnEmbeddedAppDisconnected(Id view_id) {
   View* view = GetViewById(view_id);
   if (view) {
     FOR_EACH_OBSERVER(ViewObserver, *ViewPrivate(view).observers(),
                       OnViewEmbeddedAppDisconnected(view));
   }
 }
 
@@ skipping 176 matching lines @@
                                                        uint32 active_view_id) {
   if (GetViewById(focused_view_id) != focused_view_)
     OnFocusChanged(focused_view_ ? focused_view_->id() : 0, focused_view_id);
   if (GetViewById(active_view_id) != activated_view_) {
     OnActiveWindowChanged(activated_view_ ? activated_view_->id() : 0,
                           active_view_id);
   }
 }
 
 }  // namespace mojo