Remove [Client=] annotation from ServiceProvider

examples/embedded_app/embedded_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 "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "examples/bitmap_uploader/bitmap_uploader.h"
@@ skipping 15 matching lines @@
 #include "url/gurl.h"
 #include "url/url_util.h"
 
 namespace mojo {
 namespace examples {
 
 const SkColor kColors[] = {SK_ColorYELLOW, SK_ColorRED, SK_ColorGREEN,
                            SK_ColorMAGENTA};
 
 struct Window {
-  Window(View* root,
-         scoped_ptr<ServiceProvider> embedder_service_provider,
-         Shell* shell)
+  Window(View* root, ServiceProviderPtr embedder_service_provider, Shell* shell)
       : root(root),
         embedder_service_provider(embedder_service_provider.Pass()),
         bitmap_uploader(root) {
     bitmap_uploader.Init(shell);
   }
 
   View* root;
-  scoped_ptr<ServiceProvider> embedder_service_provider;
+  ServiceProviderPtr embedder_service_provider;
   BitmapUploader bitmap_uploader;
 };
 
 class EmbeddedApp
     : public ApplicationDelegate,
       public ViewManagerDelegate,
       public ViewObserver {
  public:
   EmbeddedApp() : shell_(nullptr) { url::AddStandardScheme("mojo"); }
   virtual ~EmbeddedApp() {}
 
  private:
 
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) override {
     shell_ = app->shell();
     view_manager_client_factory_.reset(
         new ViewManagerClientFactory(app->shell(), this));
   }
 
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) override {
     connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
   virtual void OnEmbed(View* root,
-                       ServiceProviderImpl* exported_services,
-                       scoped_ptr<ServiceProvider> imported_services) override {
+                       InterfaceRequest<ServiceProvider> services,
+                       ServiceProviderPtr exposed_services) override {
     root->AddObserver(this);
-    Window* window = new Window(root, imported_services.Pass(), shell_);
+    Window* window = new Window(root, exposed_services.Pass(), shell_);
     windows_[root->id()] = window;
     window->bitmap_uploader.SetColor(
         kColors[next_color_++ % arraysize(kColors)]);
   }
   virtual void OnViewManagerDisconnected(ViewManager* view_manager) override {
     base::MessageLoop::current()->Quit();
   }
 
   // Overridden from ViewObserver:
   virtual void OnViewDestroyed(View* view) override {
@@ skipping 24 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(EmbeddedApp);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::EmbeddedApp);
   return runner.Run(shell_handle);
 }