Remove mojo.SurfacesService interface in favor of mojo.Surface directly

services/surfaces/surfaces_service_application.cc

Index: services/surfaces/surfaces_service_application.cc
diff --git a/services/surfaces/surfaces_service_application.cc b/services/surfaces/surfaces_service_application.cc
index 9aab33d300fd7fb531ca1b33cac4462d820fd08a..dfe3db0cf4f35b22a3325b7a0c8ac9837b9194f7 100644
--- a/services/surfaces/surfaces_service_application.cc
+++ b/services/surfaces/surfaces_service_application.cc
@@ -9,7 +9,6 @@
 #include "mojo/common/tracing_impl.h"
 #include "mojo/public/c/system/main.h"
 #include "services/surfaces/surfaces_impl.h"
-#include "services/surfaces/surfaces_service_impl.h"
 
 namespace surfaces {
 
@@ -27,19 +26,12 @@ void SurfacesServiceApplication::Initialize(mojo::ApplicationImpl* app) {
 
 bool SurfacesServiceApplication::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
-  connection->AddService<mojo::SurfacesService>(this);
-  connection->AddService<mojo::Surface>(this);
+  connection->AddService(this);
   return true;
 }
 
 void SurfacesServiceApplication::Create(
     mojo::ApplicationConnection* connection,
-    mojo::InterfaceRequest<mojo::SurfacesService> request) {
-  new SurfacesServiceImpl(&manager_, &next_id_namespace_, this, request.Pass());
-}
-
-void SurfacesServiceApplication::Create(
-    mojo::ApplicationConnection* connection,
     mojo::InterfaceRequest<mojo::Surface> request) {
   new SurfacesImpl(&manager_, next_id_namespace_++, this, request.Pass());
 }