Client side name cleanup

mojo/mojo_services.gypi

 {
   'targets': [
     {
       'target_name': 'mojo_echo_bindings',
       'type': 'static_library',
       'sources': [
         'services/dbus_echo/echo.mojom',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
@@ skipping 224 matching lines @@
         'services/network/network_service_impl.cc',
         'services/network/network_service_impl.h',
         'services/network/url_loader_impl.cc',
         'services/network/url_loader_impl.h',
       ],
     },
     {
       'target_name': 'mojo_view_manager_common',
       'type': 'static_library',
       'sources': [
-        'services/public/cpp/view_manager/view_manager_types.h',
+        'services/public/cpp/view_manager/types.h',
       ],
     },
     {
       'target_name': 'mojo_launcher_bindings',
       'type': 'static_library',
       'sources': [
         'services/public/interfaces/launcher/launcher.mojom',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
@@ skipping 48 matching lines @@
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_application',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_service_provider_bindings',
         'mojo_view_manager_bindings',
         'mojo_view_manager_common',
       ],
       'sources': [
+        'services/public/cpp/view_manager/lib/node.cc',
+        'services/public/cpp/view_manager/lib/node_observer.cc',
+        'services/public/cpp/view_manager/lib/node_private.cc',
+        'services/public/cpp/view_manager/lib/node_private.h',
         'services/public/cpp/view_manager/lib/view.cc',
         'services/public/cpp/view_manager/lib/view_private.cc',
         'services/public/cpp/view_manager/lib/view_private.h',
-        'services/public/cpp/view_manager/lib/view_manager_synchronizer.cc',
-        'services/public/cpp/view_manager/lib/view_manager_synchronizer.h',
-        'services/public/cpp/view_manager/lib/view_tree_host.cc',
-        'services/public/cpp/view_manager/lib/view_tree_node.cc',
-        'services/public/cpp/view_manager/lib/view_tree_node_observer.cc',
-        'services/public/cpp/view_manager/lib/view_tree_node_private.cc',
-        'services/public/cpp/view_manager/lib/view_tree_node_private.h',
+        'services/public/cpp/view_manager/lib/view_manager_client_impl.cc',
+        'services/public/cpp/view_manager/lib/view_manager_client_impl.h',
+        'services/public/cpp/view_manager/node.h',
+        'services/public/cpp/view_manager/node_observer.h',
         'services/public/cpp/view_manager/view.h',
         'services/public/cpp/view_manager/view_manager.h',
         'services/public/cpp/view_manager/view_manager_delegate.h',
-        'services/public/cpp/view_manager/view_manager_types.h',
         'services/public/cpp/view_manager/view_observer.h',
-        'services/public/cpp/view_manager/view_tree_host.h',
-        'services/public/cpp/view_manager/view_tree_node.h',
-        'services/public/cpp/view_manager/view_tree_node_observer.h',
       ],
     },
     {
       'target_name': 'mojo_view_manager_lib_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
         'mojo_environment_chromium',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_shell_test_support',
         'mojo_view_manager_bindings',
         'mojo_view_manager_lib',
       ],
       'sources': [
+        'services/public/cpp/view_manager/tests/node_unittest.cc',
         'services/public/cpp/view_manager/tests/view_unittest.cc',
         'services/public/cpp/view_manager/tests/view_manager_unittest.cc',
-        'services/public/cpp/view_manager/tests/view_tree_host_unittest.cc',
-        'services/public/cpp/view_manager/tests/view_tree_node_unittest.cc',
       ],
       'conditions': [
         ['use_aura==1', {
           'dependencies': [
             'mojo_view_manager_run_unittests'
           ],
         }, {  # use_aura==0
           'dependencies': [
             'mojo_run_all_unittests',
           ],
@@ skipping 165 matching lines @@
             'mojo_system_impl',
           ],
           'sources': [
             'services/dbus_echo/dbus_echo_service.cc',
           ],
         },
       ],
     }],
   ],
 }