Remove [Client=] annotation from ServiceProvider

services/window_manager/window_manager_app.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 "services/window_manager/window_manager_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
@@ skipping 25 matching lines @@
 Id GetIdForView(View* view) {
   return view ? view->id() : 0;
 }
 
 }  // namespace
 
 // Used for calls to Embed() that occur before we've connected to the
 // ViewManager.
 struct WindowManagerApp::PendingEmbed {
   mojo::String url;
-  mojo::InterfaceRequest<ServiceProvider> service_provider;
+  mojo::InterfaceRequest<ServiceProvider> services;
+  mojo::ServiceProviderPtr exposed_services;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, public:
 
 WindowManagerApp::WindowManagerApp(
     ViewManagerDelegate* view_manager_delegate,
     WindowManagerDelegate* window_manager_delegate)
     : shell_(nullptr),
       native_viewport_event_dispatcher_factory_(this),
@@ skipping 59 matching lines @@
   focus_controller_->AddObserver(this);
   SetFocusController(root_, focus_controller_.get());
 
   capture_controller_.reset(new CaptureController);
   capture_controller_->AddObserver(this);
   SetCaptureController(root_, capture_controller_.get());
 }
 
 void WindowManagerApp::Embed(
     const mojo::String& url,
-    mojo::InterfaceRequest<ServiceProvider> service_provider) {
+    mojo::InterfaceRequest<mojo::ServiceProvider> services,
+    mojo::ServiceProviderPtr exposed_services) {
   if (view_manager()) {
-    window_manager_delegate_->Embed(url, service_provider.Pass());
+    window_manager_delegate_->Embed(url, services.Pass(),
+                                    exposed_services.Pass());
     return;
   }
   scoped_ptr<PendingEmbed> pending_embed(new PendingEmbed);
   pending_embed->url = url;
-  pending_embed->service_provider = service_provider.Pass();
+  pending_embed->services = services.Pass();
+  pending_embed->exposed_services = exposed_services.Pass();
   pending_embeds_.push_back(pending_embed.release());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, ApplicationDelegate implementation:
 
 void WindowManagerApp::Initialize(mojo::ApplicationImpl* impl) {
   shell_ = impl->shell();
   LaunchViewManager(impl);
 }
 
 bool WindowManagerApp::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
   connection->AddService(static_cast<InterfaceFactory<WindowManager>*>(this));
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, ViewManagerDelegate implementation:
 
-void WindowManagerApp::OnEmbed(View* root,
-                               mojo::ServiceProviderImpl* exported_services,
-                               scoped_ptr<ServiceProvider> imported_services) {
+void WindowManagerApp::OnEmbed(
+    View* root,
+    mojo::InterfaceRequest<mojo::ServiceProvider> services,
+    mojo::ServiceProviderPtr exposed_services) {
   DCHECK(!root_);
   root_ = root;
 
   view_event_dispatcher_.reset(new ViewEventDispatcher);
 
   RegisterSubtree(root_);
 
   if (wrapped_view_manager_delegate_) {
-    wrapped_view_manager_delegate_->OnEmbed(root, exported_services,
-                                            imported_services.Pass());
+    wrapped_view_manager_delegate_->OnEmbed(root, services.Pass(),
+                                            exposed_services.Pass());
   }
 
-  for (PendingEmbed* pending_embed : pending_embeds_)
-    Embed(pending_embed->url, pending_embed->service_provider.Pass());
+  for (PendingEmbed* pending_embed : pending_embeds_) {
+    Embed(pending_embed->url, pending_embed->services.Pass(),
+          pending_embed->exposed_services.Pass());
+  }
   pending_embeds_.clear();
 }
 
 void WindowManagerApp::OnViewManagerDisconnected(
     mojo::ViewManager* view_manager) {
   if (wrapped_view_manager_delegate_)
     wrapped_view_manager_delegate_->OnViewManagerDisconnected(view_manager);
 
   base::MessageLoop* message_loop = base::MessageLoop::current();
   if (message_loop && message_loop->is_running())
@@ skipping 205 matching lines @@
     uint16_t connection_id,
     mojo::ScopedMessagePipeHandle window_manager_pipe) {
   // TODO(sky): pass in |connection_id| for validation.
   WindowManagerImpl* wm = new WindowManagerImpl(this, true);
   wm->Bind(window_manager_pipe.Pass());
   // WindowManagerImpl is deleted when the connection has an error, or from our
   // destructor.
 }
 
 }  // namespace window_manager