Remove COMPOSITOR_2 flag, old compositor code.

BUG=none
TEST=compiles, run manually

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

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

common.gypi

@@ -653,8 +653,7 @@
         'defines': ['TOOLKIT_VIEWS=1'],
       }],
       ['views_compositor==1', {
-        # TODO(sky): nuke COMPOSITOR_2 when we remove it from views.
-        'defines': ['VIEWS_COMPOSITOR=1', 'COMPOSITOR_2=1'],
+        'defines': ['VIEWS_COMPOSITOR=1'],
       }],
       ['chromeos==1', {
         'defines': ['OS_CHROMEOS=1'],