Fold views_compositor=1 into use_aura=1

ui/gfx/compositor/compositor.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 38 matching lines @@
         'layer_animator.h',
         'scoped_layer_animation_settings.cc',
         'scoped_layer_animation_settings.h',
         'screen_rotation.cc',
         'screen_rotation.h',
         # UI tests need TestWebGraphicsContext3D, so we always build it.
         'test_web_graphics_context_3d.cc',
         'test_web_graphics_context_3d.h',
       ],
       'conditions': [
-        ['OS == "win" and views_compositor == 1', {
+        ['OS == "win" and use_aura == 1', {
           # TODO(sky): before we make this real need to remove
           # IDR_BITMAP_BRUSH_IMAGE.
           'dependencies': [
             '<(DEPTH)/ui/ui.gyp:gfx_resources',
             '<(DEPTH)/third_party/angle/src/build_angle.gyp:libEGL',
             '<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2',
           ],
         }],
       ],
     },
@@ skipping 59 matching lines @@
         # osmesa GL implementation is used on linux.
         ['OS=="linux"', {
           'dependencies': [
             '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
           ],
         }],
       ],
     },
   ],
 }