Split surface id and simplify connecting to surfaces service

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 bac79f629c1449609566741989aa9d8eb3e6a78a..9aab33d300fd7fb531ca1b33cac4462d820fd08a 100644
--- a/services/surfaces/surfaces_service_application.cc
+++ b/services/surfaces/surfaces_service_application.cc
@@ -8,6 +8,7 @@
 #include "mojo/application/application_runner_chromium.h"
 #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 {
@@ -26,7 +27,8 @@ void SurfacesServiceApplication::Initialize(mojo::ApplicationImpl* app) {
 
 bool SurfacesServiceApplication::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
-  connection->AddService(this);
+  connection->AddService<mojo::SurfacesService>(this);
+  connection->AddService<mojo::Surface>(this);
   return true;
 }
 
@@ -36,6 +38,12 @@ void SurfacesServiceApplication::Create(
   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());
+}
+
 void SurfacesServiceApplication::OnVSyncParametersUpdated(
     base::TimeTicks timebase,
     base::TimeDelta interval) {