Remove use_libcc_for_compositor gyp variable

cc/cc.gyp

Index: cc/cc.gyp
diff --git a/cc/cc.gyp b/cc/cc.gyp
index 495739cb86163915b6c0be603ae145b1612c9c70..39e856adb3cc8f88cf5cff67fe1d159dba103a06 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -5,7 +5,6 @@
 {
   'variables': {
     'chromium_code': 0,
-    'use_libcc_for_compositor%': 0,
     'cc_source_files': [
       'hash_pair.h',
       'own_ptr_vector.h',
@@ -351,66 +350,62 @@
       'includes': [
         'cc.gypi',
       ],
-      'conditions': [
-        ['use_libcc_for_compositor==1', {
-          'dependencies': [
-            '<(DEPTH)/base/base.gyp:base',
-            '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-            '<(DEPTH)/skia/skia.gyp:skia',
-            '<(DEPTH)/ui/gl/gl.gyp:gl',
-            '<(DEPTH)/ui/ui.gyp:ui',
-            '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
-            '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_platform_geometry',
-            '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_support',
-          ],
-          'defines': [
-            # http://crbug.com/154052
-            'WEBKIT_GLUE_IMPLEMENTATION=1',
-          ],
-          'include_dirs': [
-            '<(webkit_src_dir)/Source/Platform/chromium',
-            '<@(cc_stubs_dirs)',
-          ],
-          'sources': [
-            '<@(cc_source_files)',
-            'stubs/Extensions3D.h',
-            'stubs/Extensions3DChromium.h',
-            'stubs/FloatPoint.h',
-            'stubs/FloatPoint3D.h',
-            'stubs/FloatQuad.h',
-            'stubs/FloatRect.h',
-            'stubs/FloatSize.h',
-            'stubs/GraphicsContext3D.h',
-            'stubs/GraphicsTypes3D.h',
-            'stubs/IntPoint.h',
-            'stubs/IntRect.h',
-            'stubs/IntSize.h',
-            'stubs/NotImplemented.h',
-            'stubs/Region.h',
-            'stubs/SkiaUtils.h',
-            'stubs/TilingData.h',
-            'stubs/TraceEvent.h',
-            'stubs/UnitBezier.h',
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/ui/gl/gl.gyp:gl',
+        '<(DEPTH)/ui/ui.gyp:ui',
+        '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
+        '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_platform_geometry',
+        '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_support',
+      ],
+      'defines': [
+        # http://crbug.com/154052
+        'WEBKIT_GLUE_IMPLEMENTATION=1',
+      ],
+      'include_dirs': [
+        '<(webkit_src_dir)/Source/Platform/chromium',
+        '<@(cc_stubs_dirs)',
+      ],
+      'sources': [
+        '<@(cc_source_files)',
+        'stubs/Extensions3D.h',
+        'stubs/Extensions3DChromium.h',
+        'stubs/FloatPoint.h',
+        'stubs/FloatPoint3D.h',
+        'stubs/FloatQuad.h',
+        'stubs/FloatRect.h',
+        'stubs/FloatSize.h',
+        'stubs/GraphicsContext3D.h',
+        'stubs/GraphicsTypes3D.h',
+        'stubs/IntPoint.h',
+        'stubs/IntRect.h',
+        'stubs/IntSize.h',
+        'stubs/NotImplemented.h',
+        'stubs/Region.h',
+        'stubs/SkiaUtils.h',
+        'stubs/TilingData.h',
+        'stubs/TraceEvent.h',
+        'stubs/UnitBezier.h',
 
-            'stubs/extensions_3d_chromium.h',
-            'stubs/extensions_3d.h',
-            'stubs/float_point_3d.h',
-            'stubs/float_point.h',
-            'stubs/float_quad.h',
-            'stubs/float_rect.h',
-            'stubs/float_size.h',
-            'stubs/graphics_context_3d.h',
-            'stubs/graphics_types_3d.h',
-            'stubs/int_point.h',
-            'stubs/int_rect.h',
-            'stubs/int_size.h',
-            'stubs/not_implemented.h',
-            'stubs/skia_utils.h',
-            'stubs/tiling_data.h',
-            'stubs/trace_event.h',
-            'stubs/unit_bezier.h',
-          ],
-        }],
+        'stubs/extensions_3d_chromium.h',
+        'stubs/extensions_3d.h',
+        'stubs/float_point_3d.h',
+        'stubs/float_point.h',
+        'stubs/float_quad.h',
+        'stubs/float_rect.h',
+        'stubs/float_size.h',
+        'stubs/graphics_context_3d.h',
+        'stubs/graphics_types_3d.h',
+        'stubs/int_point.h',
+        'stubs/int_rect.h',
+        'stubs/int_size.h',
+        'stubs/not_implemented.h',
+        'stubs/skia_utils.h',
+        'stubs/tiling_data.h',
+        'stubs/trace_event.h',
+        'stubs/unit_bezier.h',
       ],
     },
   ],