Remove [Client=] annotation from ServiceProvider

examples/wm_flow/wm/frame_controller.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 "examples/wm_flow/wm/frame_controller.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
-#include "mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/public/interfaces/application/service_provider.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view.h"
 #include "mojo/services/view_manager/public/cpp/view_manager.h"
 #include "services/window_manager/capture_controller.h"
 #include "services/window_manager/window_manager_app.h"
 #include "url/gurl.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // FrameController, public:
 
 FrameController::FrameController(
     const GURL& frame_app_url,
     mojo::View* view,
     mojo::View** app_view,
     window_manager::WindowManagerApp* window_manager_app)
     : view_(view),
       app_view_(view->view_manager()->CreateView()),
       maximized_(false),
       window_manager_app_(window_manager_app),
       binding_(this) {
   view_->AddObserver(this);
   view_->SetVisible(true);  // FIXME: This should not be our responsibility?
   *app_view = app_view_;
 
-  scoped_ptr<mojo::ServiceProviderImpl> exported_services(
-      new mojo::ServiceProviderImpl());
-  exported_services->AddService(this);
+  viewer_services_impl_.AddService(this);
+  mojo::ServiceProviderPtr viewer_services;
+  viewer_services_impl_.Bind(GetProxy(&viewer_services));
 
-  viewer_services_ =
-      view_->Embed(frame_app_url.spec(), exported_services.Pass());
+  view_->Embed(frame_app_url.spec(), nullptr, viewer_services.Pass());
 
   // We weren't observing when our initial bounds was set:
   OnViewBoundsChanged(view, view->bounds(), view->bounds());
 
   // Add the child view after embedding sky, since embed clears children.
   view_->AddChild(app_view_);
   app_view_->SetVisible(true);
 }
 
 FrameController::~FrameController() {}
@@ skipping 47 matching lines @@
   const int kTopControlsAdditionalInset = 15;
   const int kDefaultInset = 25;
   mojo::Rect bounds;
   bounds.x = bounds.y = kDefaultInset;
   bounds.y += kTopControlsAdditionalInset;
   bounds.width = view_->bounds().width - kDefaultInset * 2;
   bounds.height =
       view_->bounds().height - kDefaultInset * 2 - kTopControlsAdditionalInset;
   app_view_->SetBounds(bounds);
 }