Mojo: Use InterfaceFactory<Interface> for service registration

mojo/services/surfaces/surfaces_service_application.h

Index: mojo/services/surfaces/surfaces_service_application.h
diff --git a/mojo/services/surfaces/surfaces_service_application.h b/mojo/services/surfaces/surfaces_service_application.h
index ac6820dc400a6a323de5ba89d15d57fc9360757e..b840f4a355f8916085ca2fa17f5b999f3f710556 100644
--- a/mojo/services/surfaces/surfaces_service_application.h
+++ b/mojo/services/surfaces/surfaces_service_application.h
@@ -14,9 +14,11 @@ namespace mojo {
 class ApplicationConnection;
 
 namespace surfaces {
+class Surfaces;
 
 class SurfacesServiceApplication : public ApplicationDelegate,
-                                   public SurfacesImpl::Context {
+                                   public InterfaceProvider<Surface>,
+                                   public SurfacesImpl::Client {
  public:
   SurfacesServiceApplication();
   virtual ~SurfacesServiceApplication();
@@ -25,9 +27,11 @@ class SurfacesServiceApplication : public ApplicationDelegate,
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) OVERRIDE;
 
-  // SurfacesImpl::Context implementation.
-  virtual cc::SurfaceManager* Manager() OVERRIDE;
-  virtual uint32_t IdNamespace() OVERRIDE;
+  // InterfaceProvider<Surface> implementation.
+  virtual void BindToRequest(ApplicationConnection* connection,
+                             InterfaceRequest<Surface> request) OVERRIDE;
+
+  // SurfacesImpl::Client implementation.
   virtual void FrameSubmitted() OVERRIDE;
   virtual void SetDisplay(cc::Display*) OVERRIDE;