Mojo: Use InterfaceFactory<Interface> for service registration

mojo/examples/surfaces_app/child_impl.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 MOJO_EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
 #define MOJO_EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_id_allocator.h"
@@ skipping 11 matching lines @@
 namespace mojo {
 
 class ApplicationConnection;
 
 namespace surfaces {
 class Surface;
 }
 
 namespace examples {
 
-class SurfaceClientImpl;
-
 // Simple example of a child app using surfaces.
-class ChildImpl : public InterfaceImpl<Child> {
+class ChildImpl : public InterfaceImpl<Child>, public surfaces::SurfaceClient {
  public:
   class Context {
    public:
     virtual ApplicationConnection* ShellConnection(
         const mojo::String& application_url) = 0;
   };
-  ChildImpl(ApplicationConnection* connection, Context* context);
+  explicit ChildImpl(ApplicationConnection* surfaces_service_connection);
   virtual ~ChildImpl();
 
-  void SetIdNamespace(uint32_t id_namespace);
+  // surfaces::SurfaceClient implementation
+  virtual void SetIdNamespace(uint32_t id_namespace) OVERRIDE;
+  virtual void ReturnResources(
+      Array<surfaces::ReturnedResourcePtr> resources) OVERRIDE;
 
  private:
   // Child implementation.
   virtual void ProduceFrame(
       surfaces::ColorPtr color,
       SizePtr size,
       const mojo::Callback<void(surfaces::SurfaceIdPtr id)>& callback) OVERRIDE;
 
   void Draw();
 
   SkColor color_;
   gfx::Size size_;
   scoped_ptr<cc::SurfaceIdAllocator> allocator_;
   surfaces::SurfacePtr surface_;
   cc::SurfaceId id_;
-  scoped_ptr<SurfaceClientImpl> surface_client_;
   mojo::Callback<void(surfaces::SurfaceIdPtr id)> produce_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildImpl);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 #endif  // MOJO_EXAMPLES_SURFACES_APP_CHILD_IMPL_H_