Update CDM interface and add clear key CDM.

webkit/media/webkit_media.gypi

Index: webkit/media/webkit_media.gypi
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
index 834ba487a5fb203a13e7b427ce37d5944eef83ff..7ac9b9b6da8fa6a412fcab4ab3b3740a81a90588 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -84,10 +84,27 @@
       ],
     },
     {
-      'target_name': 'ppapi_cdm_wrapper',
+      'target_name': 'clearkeycdm',
+      'type': 'shared_library',
+      'defines': ['CDM_IMPLEMENTATION'],
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/media/media.gyp:media'
+      ],
+      'sources': [
+        'crypto/ppapi/clear_key_cdm.cc',
+        'crypto/ppapi/clear_key_cdm.h',
+      ],
+    },
+    {
+      'target_name': 'clearkeycdmplugin',
       'type': 'none',
       'dependencies': [
-        '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp'
+        '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
+        'clearkeycdm',
+      ],
+      'sources': [
+        'crypto/ppapi/cdm_wrapper.cc',
       ],
       'conditions': [
         ['os_posix==1 and OS!="mac"', {
@@ -113,9 +130,6 @@
             ]},
         }],
       ],
-      'sources': [
-        'crypto/ppapi/cdm_wrapper.cc',
-      ],
     }
   ],
 }