Remove uses of InterfaceImpl in wm_flow example

examples/wm_flow/app/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 <map>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "examples/bitmap_uploader/bitmap_uploader.h"
 #include "examples/wm_flow/app/embedder.mojom.h"
 #include "examples/wm_flow/embedded/embeddee.mojom.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_connection.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/interface_factory_impl.h"
 #include "mojo/public/cpp/application/service_provider_impl.h"
+#include "mojo/public/cpp/bindings/strong_binding.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 "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_context.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
 #include "mojo/services/view_manager/public/cpp/view_observer.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "url/gurl.h"
 
 namespace examples {
 namespace {
 
 const SkColor kColors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorYELLOW };
 
-class EmbedderImpl : public mojo::InterfaceImpl<Embedder> {
+class EmbedderImpl : public Embedder {
  public:
-  EmbedderImpl() {}
-  virtual ~EmbedderImpl() {}
+  explicit EmbedderImpl(mojo::InterfaceRequest<Embedder> request)
+      : binding_(this, request.Pass()) {}
+  ~EmbedderImpl() override {}
 
  private:
   // Overridden from Embedder:
-  virtual void HelloWorld(const mojo::Callback<void()>& callback) override {
+  void HelloWorld(const mojo::Callback<void()>& callback) override {
     callback.Run();
   }
 
+  mojo::StrongBinding<Embedder> binding_;
   DISALLOW_COPY_AND_ASSIGN(EmbedderImpl);
 };
 
 class EmbedderImplProvider : public mojo::ServiceProvider {
  public:
   EmbedderImplProvider() {}
   ~EmbedderImplProvider() override {}
 
   void AddBinding(mojo::InterfaceRequest<mojo::ServiceProvider> request) {
     embeddee_exposed_services_.AddBinding(this, request.Pass());
   }
 
  private:
   // mojo::ServiceProvider implementation
   void ConnectToService(const mojo::String& interface_name,
                         mojo::ScopedMessagePipeHandle pipe_handle) override {
     if (interface_name != Embedder::Name_)
       return;
-    auto request = mojo::MakeRequest<Embedder>(pipe_handle.Pass());
-    mojo::BindToRequest(new EmbedderImpl, &request);
+    new EmbedderImpl(mojo::MakeRequest<Embedder>(pipe_handle.Pass()));
   }
 
   mojo::WeakBindingSet<mojo::ServiceProvider> embeddee_exposed_services_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbedderImplProvider);
 };
 
 }  // namespace
 
 // This app starts its life via Connect() rather than by being embed, so it does
@@ skipping 107 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(WMFlowApp);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp);
   return runner.Run(shell_handle);
 }