Replace Chromium's content_decryption_module.h with the independent DEPS'd instance.

webkit/media/webkit_media.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.
 
 {
   'variables': {
     'conditions': [
       ['OS == "android" or OS == "ios"', {
         # Android and iOS don't use ffmpeg.
         'use_ffmpeg%': 0,
@@ skipping 163 matching lines @@
     },
     {
       'target_name': 'clearkeycdmplugin',
       'type': 'none',
       'dependencies': [
         '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
         'clearkeycdm',
       ],
       'sources': [
         'crypto/ppapi/cdm_wrapper.cc',
-        'crypto/ppapi/content_decryption_module.h',
+        'crypto/ppapi/cdm/content_decryption_module.h',
         'crypto/ppapi/linked_ptr.h',
       ],
       'conditions': [
         ['os_posix == 1 and OS != "mac"', {
           'cflags': ['-fvisibility=hidden'],
           'type': 'loadable_module',
           # Allow the plugin wrapper to find the CDM in the same directory.
           'ldflags': ['-Wl,-rpath=\$$ORIGIN'],
           'libraries': [
             # Built by clearkeycdm.
@@ skipping 12 matching lines @@
               # Not to strip important symbols by -Wl,-dead_strip.
               '-Wl,-exported_symbol,_PPP_GetInterface',
               '-Wl,-exported_symbol,_PPP_InitializeModule',
               '-Wl,-exported_symbol,_PPP_ShutdownModule'
             ]},
         }],
       ],
     }
   ],
 }