Rationalize dependency on khronos EGL headers in place of angle.

content/content_common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../build/temp_gyp/googleurl.gyp:googleurl',
     '../components/tracing.gyp:tracing',
     '../media/media.gyp:media',
@@ skipping 434 matching lines @@
         '../build/linux/system.gyp:gtk',
       ],
     }],
     ['OS=="linux"', {
       'dependencies': [
         '../build/linux/system.gyp:pangocairo',
       ],
     }],
     ['use_x11 == 1', {
       'include_dirs': [
-        '<(DEPTH)/third_party/angle/include',
+        '<(DEPTH)/third_party/khronos',
       ],
       'link_settings': {
         'libraries': [
           '-lXcomposite',
         ],
       },
     }],
     ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
       'sources': [
         'common/gpu/x_util.cc',
@@ skipping 30 matching lines @@
       ],
       'sources': [
         'common/gpu/media/exynos_video_decode_accelerator.cc',
         'common/gpu/media/exynos_video_decode_accelerator.h',
         'common/gpu/media/gles2_texture_to_egl_image_translator.cc',
         'common/gpu/media/gles2_texture_to_egl_image_translator.h',
         'common/gpu/media/omx_video_decode_accelerator.cc',
         'common/gpu/media/omx_video_decode_accelerator.h',
       ],
       'include_dirs': [
-        '<(DEPTH)/third_party/angle/include',
+        '<(DEPTH)/third_party/khronos',
         '<(DEPTH)/third_party/openmax/il',
       ],
       'link_settings': {
         'libraries': [
           '-lEGL',
           '-lGLESv2',
         ],
       },
     }],
     ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
@@ skipping 32 matching lines @@
               'mfplat.dll',
             ],
           },
         },
       },
       'sources': [
         'common/gpu/media/dxva_video_decode_accelerator.cc',
         'common/gpu/media/dxva_video_decode_accelerator.h',
       ],
       'include_dirs': [
-        '<(DEPTH)/third_party/angle/include',
+        '<(DEPTH)/third_party/khronos',
       ],
     }],
     ['OS=="win" and directxsdk_exists=="True"', {
       'actions': [
       {
         'action_name': 'extract_xinput',
         'variables': {
           'input': 'APR2007_xinput_x86.cab',
           'output': 'xinput1_3.dll',
         },
         'inputs': [
           '../third_party/directxsdk/files/Redist/<(input)',
         ],
         'outputs': [
           '<(PRODUCT_DIR)/<(output)',
         ],
         'action': [
           'python',
         '../build/extract_from_cab.py',
         '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
         '<(output)',
         '<(PRODUCT_DIR)',
         ],
         'msvs_cygwin_shell': 1,
       },
      ]
     }],
   ],
 }