Attempt 2 at : Makes tests either use mock compositor or mock

ui/views/views.gyp

Index: ui/views/views.gyp
diff --git a/ui/views/views.gyp b/ui/views/views.gyp
index 3b60864579fe02cdfd7b7863428c2936b3bfbc42..cefa1625044285f2a932ab4cca5d33dccd1f8195 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -498,7 +498,6 @@
         '../../third_party/icu/icu.gyp:icuuc',
         '../base/strings/ui_strings.gyp:ui_strings',
         '../gfx/compositor/compositor.gyp:compositor_test_support',
-        '../gfx/compositor/compositor.gyp:test_compositor',
         '../ui.gyp:gfx_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
@@ -594,6 +593,15 @@
             ['exclude', 'test/test_tooltip_client.cc'],
           ],
         }],
+        ['use_webkit_compositor==1', {
+          'dependencies': [
+            '../gfx/compositor/compositor.gyp:compositor',
+          ],
+        }, { # use_webkit_compositor!=1
+          'dependencies': [
+            '../gfx/compositor/compositor.gyp:test_compositor',
+          ],
+        }],
       ],
     },  # target_name: views_unittests
     {