More viewmanager renaming:

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': [
     {
       'target_name': 'mojo_html_viewer',
       'type': 'loadable_module',
       'dependencies': [
@@ skipping 680 matching lines @@
             'mojo_native_viewport_bindings',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
             'mojo_gpu_bindings',
             '<(mojo_gles2_for_component)',
             '<(mojo_system_for_component)',
           ],
           'sources': [
             'services/view_manager/access_policy.h',
             'services/view_manager/access_policy_delegate.h',
+            'services/view_manager/connection_manager.cc',
+            'services/view_manager/connection_manager.h',
             'services/view_manager/context_factory_impl.cc',
             'services/view_manager/context_factory_impl.h',
             'services/view_manager/default_access_policy.cc',
             'services/view_manager/default_access_policy.h',
             'services/view_manager/display_manager.cc',
             'services/view_manager/display_manager.h',
             'services/view_manager/display_manager_delegate.h',
             'services/view_manager/ids.h',
             'services/view_manager/main.cc',
-            'services/view_manager/node.cc',
-            'services/view_manager/node.h',
-            'services/view_manager/node_delegate.h',
-            'services/view_manager/root_node_manager.cc',
-            'services/view_manager/root_node_manager.h',
             'services/view_manager/screen_impl.cc',
             'services/view_manager/screen_impl.h',
+            'services/view_manager/server_view.cc',
+            'services/view_manager/server_view.h',
+            'services/view_manager/server_view_delegate.h',
             'services/view_manager/view_manager_export.h',
             'services/view_manager/view_manager_init_service_context.cc',
             'services/view_manager/view_manager_init_service_context.h',
             'services/view_manager/view_manager_init_service_impl.cc',
             'services/view_manager/view_manager_init_service_impl.h',
             'services/view_manager/view_manager_service_impl.cc',
             'services/view_manager/view_manager_service_impl.h',
             'services/view_manager/window_manager_access_policy.cc',
             'services/view_manager/window_manager_access_policy.h',
             'services/view_manager/window_tree_host_impl.cc',
@@ skipping 135 matching lines @@
               'dependencies': [
                 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }