Mojo: Use InterfaceFactory<Interface> for service registration

mojo/services/surfaces/surfaces_impl.h

Index: mojo/services/surfaces/surfaces_impl.h
diff --git a/mojo/services/surfaces/surfaces_impl.h b/mojo/services/surfaces/surfaces_impl.h
index 5ecb9cf57ddfa1554848afbf615d38de7e115846..21f2daab0298826e7fa9a2647bc76c9e038d35e8 100644
--- a/mojo/services/surfaces/surfaces_impl.h
+++ b/mojo/services/surfaces/surfaces_impl.h
@@ -28,14 +28,15 @@ class SurfacesImpl : public InterfaceImpl<Surface>,
                      public cc::SurfaceFactoryClient,
                      public cc::DisplayClient {
  public:
-  class Context {
+  class Client {
    public:
-    virtual cc::SurfaceManager* Manager() = 0;
-    virtual uint32_t IdNamespace() = 0;
     virtual void FrameSubmitted() = 0;
     virtual void SetDisplay(cc::Display*) = 0;
   };
-  SurfacesImpl(ApplicationConnection* app, Context* context);
+
+  SurfacesImpl(cc::SurfaceManager* manager,
+               uint32_t id_namespace,
+               Client* client);
   virtual ~SurfacesImpl();
 
   // InterfaceImpl<Surface> implementation.
@@ -59,9 +60,10 @@ class SurfacesImpl : public InterfaceImpl<Surface>,
   cc::SurfaceFactory* factory() { return &factory_; }
 
  private:
-  Context* context_;
+  cc::SurfaceManager* manager_;
   cc::SurfaceFactory factory_;
   uint32_t id_namespace_;
+  Client* client_;
   scoped_ptr<cc::Display> display_;
   ScopedMessagePipeHandle command_buffer_handle_;