Merge Compositor and CompositorCC

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 161464c9237c8cf41af138d9243807263660b675..f7ac9166d4e763f017bfd37b2b89ea1c059ede3c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -264,9 +264,6 @@
       # Enable plug-in installation by default.
       'enable_plugin_installation%': 1,
 
-      # Use the WebKit compositor for ui.
-      'use_webkit_compositor%': 1,
-
       # Specifies whether to use canvas_skia_skia.cc in place of platform
       # specific implementations of CanvasSkia. Affects text drawing in the
       # Chrome UI.
@@ -404,7 +401,6 @@
     'toolkit_views%': '<(toolkit_views)',
     'views_compositor%': '<(views_compositor)',
     'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
-    'use_webkit_compositor%': '<(use_webkit_compositor)',
     'use_aura%': '<(use_aura)',
     'use_ash%': '<(use_ash)',
     'use_openssl%': '<(use_openssl)',
@@ -1050,9 +1046,6 @@
       ['ui_compositor_image_transport==1', {
         'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
       }],
-      ['use_webkit_compositor==1', {
-        'defines': ['USE_WEBKIT_COMPOSITOR=1'],
-      }],
       ['use_aura==1', {
         'defines': ['USE_AURA=1'],
       }],