Remove [Client=] annotation from ServiceProvider

services/window_manager/window_manager_app.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 SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 #define SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 73 matching lines @@
 
   FocusController* focus_controller() { return focus_controller_.get(); }
   CaptureController* capture_controller() { return capture_controller_.get(); }
 
   void InitFocus(scoped_ptr<FocusRules> rules);
 
   // WindowManagerImpl::Embed() forwards to this. If connected to ViewManager
   // then forwards to delegate, otherwise waits for connection to establish then
   // forwards.
   void Embed(const mojo::String& url,
-             mojo::InterfaceRequest<mojo::ServiceProvider> service_provider);
+             mojo::InterfaceRequest<mojo::ServiceProvider> services,
+             mojo::ServiceProviderPtr exposed_services);
 
   // Overridden from ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* impl) override;
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override;
 
  private:
   // TODO(sky): rename this. Connections is ambiguous.
   typedef std::set<WindowManagerImpl*> Connections;
   typedef std::set<mojo::Id> RegisteredViewIdSet;
@@ skipping 13 matching lines @@
 
   // Recursively invokes Unregister() for |view| and all its descendants.
   void UnregisterSubtree(mojo::View* view);
 
   // Deletes the ViewTarget associated with the hierarchy beneath |id|,
   // and removes from the registry.
   void Unregister(mojo::View* view);
 
   // Overridden from ViewManagerDelegate:
   void OnEmbed(mojo::View* root,
-               mojo::ServiceProviderImpl* exported_services,
-               scoped_ptr<mojo::ServiceProvider> imported_services) override;
+               mojo::InterfaceRequest<mojo::ServiceProvider> services,
+               mojo::ServiceProviderPtr exposed_services) override;
   void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override;
 
   // Overridden from ViewObserver:
   void OnTreeChanged(const ViewObserver::TreeChangeParams& params) override;
   void OnViewDestroying(mojo::View* view) override;
 
   // Overridden from ui::EventHandler:
   void OnEvent(ui::Event* event) override;
 
   // Overridden from mojo::FocusControllerObserver:
@@ skipping 49 matching lines @@
   scoped_ptr<ViewEventDispatcher> view_event_dispatcher_;
 
   scoped_ptr<mojo::Binding<WindowManagerInternal>> wm_internal_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApp);
 };
 
 }  // namespace window_manager
 
 #endif  // SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_