ui: Move compositor/ directory out of gfx/, up to ui/.

ui/aura/aura.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': [
     {
       'target_name': 'aura',
       'type': '<(component)',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../skia/skia.gyp:skia',
-        '../gfx/compositor/compositor.gyp:compositor',
+        '../compositor/compositor.gyp:compositor',
         '../ui.gyp:gfx_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
       ],
       'defines': [
         'AURA_IMPLEMENTATION',
       ],
       'sources': [
         'aura_switches.cc',
         'aura_switches.h',
@@ skipping 130 matching lines @@
     },
     {
       'target_name': 'aura_demo',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../skia/skia.gyp:skia',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
-        '../gfx/compositor/compositor.gyp:compositor',
-        '../gfx/compositor/compositor.gyp:compositor_test_support',
+        '../compositor/compositor.gyp:compositor',
+        '../compositor/compositor.gyp:compositor_test_support',
         '../ui.gyp:gfx_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         'aura',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'demo/demo_main.cc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
       ],
     },
     {
       'target_name': 'aura_unittests',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:test_support_base',
         '../../chrome/chrome_resources.gyp:packed_resources',
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
-        '../gfx/compositor/compositor.gyp:compositor_test_support',
-        '../gfx/compositor/compositor.gyp:compositor',
+        '../compositor/compositor.gyp:compositor_test_support',
+        '../compositor/compositor.gyp:compositor',
         '../gfx/gl/gl.gyp:gl',
         '../ui.gyp:gfx_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         'test_support_aura',
         'aura',
       ],
       'include_dirs': [
         '..',
       ],
@@ skipping 13 matching lines @@
         # osmesa GL implementation is used on linux.
         ['OS=="linux"', {
           'dependencies': [
             '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
           ],
         }],
       ],
     },
   ],
 }