Remove [Client=] annotation from ServiceProvider

sky/tools/debugger/debugger.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.
 
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
 #include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
@@ skipping 30 matching lines @@
  private:
   // Overridden from mojo::ApplicationDelegate:
   void Initialize(mojo::ApplicationImpl* app) override;
   bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) override;
   bool ConfigureOutgoingConnection(
       mojo::ApplicationConnection* connection) override;
 
   // Overridden from mojo::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;
 
   // Overriden from mojo::ViewObserver:
   void OnViewDestroyed(mojo::View* view) override;
   void OnViewBoundsChanged(mojo::View* view,
                            const mojo::Rect& old_bounds,
                            const mojo::Rect& new_bounds) override;
 
   // Overridden from InterfaceFactory<Debugger>:
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<Debugger> request) override;
 
   // Overridden from WindowManagerDelegate
-  void Embed(
-      const mojo::String& url,
-      mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) override;
+  void Embed(const mojo::String& url,
+             mojo::InterfaceRequest<mojo::ServiceProvider> services,
+             mojo::ServiceProviderPtr exposed_services) override;
 
   scoped_ptr<window_manager::WindowManagerApp> window_manager_app_;
 
   mojo::View* root_;
   mojo::View* content_;
   std::string pending_url_;
 
-  scoped_ptr<mojo::ServiceProvider> viewer_services_;
+  mojo::ServiceProviderPtr viewer_services_;
 
   NavigatorHostFactory navigator_host_factory_;
+  mojo::ServiceProviderImpl exposed_services_impl_;
 
   base::WeakPtrFactory<SkyDebugger> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SkyDebugger);
 };
 
 }  // namespace debugger
 }  // namespace sky