Update mojo surfaces bindings and mojo/cc/ glue

mojo/mojo_services.gypi

 # Copyright (c) 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.
 
 {
   'targets': [
     {
       # GN version: //mojo/services/dbus_echo:bindings
       'target_name': 'mojo_echo_bindings',
       'type': 'static_library',
@@ skipping 425 matching lines @@
         'mojo_surfaces_bindings',
         'mojo_surfaces_lib',
         '<(mojo_gles2_for_loadable_module)',
         '<(mojo_system_for_loadable_module)',
       ],
       'sources': [
         'services/surfaces/surfaces_impl.cc',
         'services/surfaces/surfaces_impl.h',
         'services/surfaces/surfaces_service_application.cc',
         'services/surfaces/surfaces_service_application.h',
+        'services/surfaces/surfaces_service_impl.cc',
+        'services/surfaces/surfaces_service_impl.h',
       ],
     },
     {
       # GN version: //mojo/services/public/cpp/view_manager:common
       'target_name': 'mojo_view_manager_common',
       'type': 'static_library',
       'sources': [
         'services/public/cpp/view_manager/types.h',
       ],
     },
@@ skipping 119 matching lines @@
             'mojo_base.gyp:mojo_run_all_unittests',
           ],
         }],
       ],
     },
     {
       # GN version: //mojo/services/public/interfaces/surfaces
       'target_name': 'mojo_surfaces_bindings',
       'type': 'static_library',
       'sources': [
+        'services/public/interfaces/surfaces/surface_id.mojom',
         'services/public/interfaces/surfaces/surfaces.mojom',
-        'services/public/interfaces/surfaces/surface_id.mojom',
+        'services/public/interfaces/surfaces/surfaces_service.mojom',
         'services/public/interfaces/surfaces/quads.mojom',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
         'mojo_base.gyp:mojo_cpp_bindings',
       ],
       'dependencies': [
         'mojo_base.gyp:mojo_cpp_bindings',
         'mojo_geometry_bindings',
         'mojo_native_viewport_bindings',
@@ skipping 298 matching lines @@
             'mojo_echo_bindings',
           ],
           'sources': [
             'services/dbus_echo/dbus_echo_service.cc',
           ],
         },
       ],
     }],
   ],
 }