Clean up cc and webkit/compositor_bindings include path shenanigans

webkit/compositor_bindings/compositor_bindings_tests.gyp

Index: webkit/compositor_bindings/compositor_bindings_tests.gyp
diff --git a/webkit/compositor_bindings/compositor_bindings_tests.gyp b/webkit/compositor_bindings/compositor_bindings_tests.gyp
index b71672963d995fa1ed9f45512671d9c043f490e6..e26474d29e37553a75b77a9237592c0c8858ad48 100644
--- a/webkit/compositor_bindings/compositor_bindings_tests.gyp
+++ b/webkit/compositor_bindings/compositor_bindings_tests.gyp
@@ -13,7 +13,6 @@
       'web_transform_animation_curve_unittest.cc',
       'web_transform_operations_unittest.cc',
       'web_transformation_matrix_unittest.cc',
-      'test/fake_web_scrollbar_theme_geometry.h',
       'test/web_layer_tree_view_test_common.h',
     ],
   },
@@ -35,12 +34,7 @@
         'test/run_all_unittests.cc',
       ],
       'include_dirs': [
-        '.',
-        'test',
-        '<(DEPTH)/cc',
-        '<(DEPTH)/cc/stubs',
-        '<(DEPTH)/cc/test',
-        '../../third_party/WebKit/Source/Platform/chromium'
+        '../..'
       ],
       'conditions': [
         ['OS == "android" and gtest_target_type == "shared_library"', {