First step at synchronizing client model changes with service.

mojo/mojo_examples.gypi

 # Copyright 2013 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_sample_app',
       'type': 'shared_library',
       'dependencies': [
@@ skipping 267 matching lines @@
         },
         {
           'target_name': 'mojo_sample_view_manager_app',
           'type': 'shared_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/gl/gl.gyp:gl',
             'mojo_cpp_bindings',
-            'mojo_environment_standalone',
+            'mojo_environment_chromium',
             'mojo_gles2',
-            'mojo_view_manager_bindings',
+            'mojo_view_manager_lib',
             'mojo_shell_client',
-            'mojo_system',
+            'mojo_system_impl',
             'mojo_utility',
           ],
           'sources': [
             'examples/sample_view_manager_app/sample_view_manager_app.cc',
           ],
         },
       ],
     }],
     ['OS=="linux"', {
       'targets': [
@@ skipping 10 matching lines @@
             'mojo_utility',
           ],
           'sources': [
             'examples/dbus_echo/dbus_echo_app.cc',
           ],
         },
       ],
     }],
   ],
 }