Merge Compositor and CompositorCC

This also removes a few unused calls.

BUG=None
TEST=compiles, tests pass


Review URL: http://codereview.chromium.org/9297041

git-svn-id: http://src.chromium.org/svn/trunk/src/build@119645 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

common.gypi

@@ -254,9 +254,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.
@@ -393,7 +390,6 @@
     'library%': 'static_library',
     'toolkit_views%': '<(toolkit_views)',
     '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)',
@@ -1036,9 +1032,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'],
       }],