Renaming the CdmWrapper build targets.

TEST=CDM builds on all supported platforms.

Review URL: https://chromiumcodereview.appspot.com/12237003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181247 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 14 insertions, 15 deletions

diff --git a/build/all.gyp b/build/all.gyp
index fa947f1..d9b856af 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -663,7 +663,7 @@
                 '../courgette/courgette.gyp:courgette64',
                 '../cloud_print/cloud_print.gyp:cloud_print',
                 '../remoting/remoting.gyp:remoting_webapp',
-                '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmplugin',
+                '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
               ],
               'conditions': [
                 ['internal_pdf', {
diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi
index 02bff5f..57d5267 100644
--- a/chrome/chrome_dll_bundle.gypi
+++ b/chrome/chrome_dll_bundle.gypi
@@ -81,7 +81,7 @@
     # dependency here. flash_player.gyp will copy the Flash bundle
     # into PRODUCT_DIR.
     '../third_party/adobe/flash/flash_player.gyp:flapper_binaries',
-    '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmplugin',
+    '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
     'chrome_resources.gyp:packed_extra_resources',
     'chrome_resources.gyp:packed_resources',
   ],
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 2c8824b..ba71ae6 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -427,7 +427,7 @@
             # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp
             # file decide what to do on a per-OS basis; on Mac, internal plugins
             # go inside the framework, so this dependency is in chrome_dll.gypi.
-            '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmplugin',
+            '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
           ],
         }],
         ['OS=="mac" and asan==1', {
diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc
index ff92fdf..4b39425 100644
--- a/content/browser/media/encrypted_media_browsertest.cc
+++ b/content/browser/media/encrypted_media_browsertest.cc
@@ -22,11 +22,11 @@
 
 // Platform-specific filename relative to the chrome executable.
 #if defined(OS_WIN)
-static const wchar_t kLibraryName[] = L"clearkeycdmplugin.dll";
+static const wchar_t kLibraryName[] = L"clearkeycdmadapter.dll";
 #elif defined(OS_MACOSX)
-static const char kLibraryName[] = "clearkeycdmplugin.plugin";
+static const char kLibraryName[] = "clearkeycdmadapter.plugin";
 #elif defined(OS_POSIX)
-static const char kLibraryName[] = "libclearkeycdmplugin.so";
+static const char kLibraryName[] = "libclearkeycdmadapter.so";
 #endif
 
 // Available key systems.
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 92cb115..569adedc 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -678,7 +678,7 @@
             '../ui/snapshot/snapshot.gyp:snapshot',
             '../ui/ui.gyp:shell_dialogs',
             '../ui/ui.gyp:ui',
-            '../webkit/support/webkit_support.gyp:clearkeycdmplugin',
+            '../webkit/support/webkit_support.gyp:clearkeycdmadapter',
             '../webkit/support/webkit_support.gyp:glue',
             '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner_resources',
           ],
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp
index 8f3498d..5bde10d 100644
--- a/third_party/widevine/cdm/widevine_cdm.gyp
+++ b/third_party/widevine/cdm/widevine_cdm.gyp
@@ -45,7 +45,7 @@
   # anything to be done in this file (instead of a higher-level .gyp file).
   'targets': [
     {
-      'target_name': 'widevinecdmplugin',
+      'target_name': 'widevinecdmadapter',
       'type': 'none',
       'conditions': [
         [ 'branding == "Chrome"', {
diff --git a/third_party/widevine/cdm/widevine_cdm_common.h b/third_party/widevine/cdm/widevine_cdm_common.h
index 752b68b..ef1d8c4 100644
--- a/third_party/widevine/cdm/widevine_cdm_common.h
+++ b/third_party/widevine/cdm/widevine_cdm_common.h
@@ -15,19 +15,18 @@ const char kWidevineKeySystem[] = "com.widevine.alpha";
 const char kWidevineCdmPluginName[] = "Widevine HTML CDM";
 // Will be parsed as HTML.
 const char kWidevineCdmPluginDescription[] =
-    "This plugin enables Widevine licenses for playback of HTML audio/video "
-    "content.";
+    "Enables Widevine licenses for playback of HTML audio/video content.";
 const char kWidevineCdmPluginMimeType[] ="application/x-ppapi-widevine-cdm";
 const char kWidevineCdmPluginMimeTypeDescription[] = "Widevine HTML CDM";
 
 // File name of the plugin on different platforms.
 const FilePath::CharType kWidevineCdmPluginFileName[] =
 #if defined(OS_MACOSX)
-    FILE_PATH_LITERAL("widevinecdmplugin.plugin");
+    FILE_PATH_LITERAL("widevinecdmadapter.plugin");
 #elif defined(OS_WIN)
-    FILE_PATH_LITERAL("widevinecdmplugin.dll");
+    FILE_PATH_LITERAL("widevinecdmadapter.dll");
 #else  // OS_LINUX, etc.
-    FILE_PATH_LITERAL("libwidevinecdmplugin.so");
+    FILE_PATH_LITERAL("libwidevinecdmadapter.so");
 #endif
 
 #endif  // WIDEVINE_CDM_COMMON_H_INCLUDED_
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
index 28ab5f4..79092c0 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -192,7 +192,7 @@
       ],
     },
     {
-      'target_name': 'clearkeycdmplugin',
+      'target_name': 'clearkeycdmadapter',
       'type': 'none',
       'dependencies': [
         '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
@@ -230,7 +230,7 @@
             ]},
           'copies': [
             {
-              'destination': '<(PRODUCT_DIR)/clearkeycdmplugin.plugin/Contents/MacOS/',
+              'destination': '<(PRODUCT_DIR)/clearkeycdmadapter.plugin/Contents/MacOS/',
               'files': [
                 '<(PRODUCT_DIR)/libclearkeycdm.dylib',
                 '<(PRODUCT_DIR)/ffmpegsumo.so'