media: Rename kIntelConvergedSecurityAndManageabilityEngine to kIntel

The new name is much shorter without losing any critical info.

TBR=jrummell@chromium.org

Bug: 854943
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ie0804fbc57233f42667be2b9f87a1adcf98ed865
Reviewed-on: https://chromium-review.googlesource.com/1108886Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569529}

DEPS

@@ -339,7 +339,7 @@ deps = {
   },
 
   'src/media/cdm/api':
-    Var('chromium_git') + '/chromium/cdm.git' + '@' + 'd1260255637fe01acd08ba166f76945e83e02cc3',
+    Var('chromium_git') + '/chromium/cdm.git' + '@' + 'bd20cfc8e34ece484e4983dc0dfcca4ec9e53253',
 
   'src/native_client': {
       'url': Var('chromium_git') + '/native_client/src/native_client.git' + '@' + Var('nacl_revision'),

chrome/gpu/widevine_cdm_proxy_factory.cc

@@ -76,7 +76,6 @@ std::unique_ptr<media::CdmProxy> CreateWidevineCdmProxy() {
        0x90000001}};
 
   return std::make_unique<media::D3D11CdmProxy>(
-      kD3D11ConfigWidevineStreamId,
-      media::CdmProxy::Protocol::kIntelConvergedSecurityAndManageabilityEngine,
+      kD3D11ConfigWidevineStreamId, media::CdmProxy::Protocol::kIntel,
       std::move(function_id_map));
 }

media/cdm/cdm_proxy.h

@@ -45,10 +45,10 @@ class MEDIA_EXPORT CdmProxy {
     // No supported protocol. Used in failure cases.
     kNone,
     // Method using Intel CSME.
-    kIntelConvergedSecurityAndManageabilityEngine,
+    kIntel,
     // There will be more values in the future e.g. kD3D11RsaHardware,
     // kD3D11RsaSoftware to use the D3D11 RSA method.
-    kMax = kIntelConvergedSecurityAndManageabilityEngine,
+    kMax = kIntel,
   };
 
   enum class Function {

media/cdm/library_cdm/clear_key_cdm/clear_key_cdm_proxy.cc

@@ -43,9 +43,8 @@ base::WeakPtr<CdmContext> ClearKeyCdmProxy::GetCdmContext() {
 void ClearKeyCdmProxy::Initialize(Client* client, InitializeCB init_cb) {
   DVLOG(1) << __func__;
 
-  std::move(init_cb).Run(
-      Status::kOk, Protocol::kIntelConvergedSecurityAndManageabilityEngine,
-      kClearKeyCdmProxyCryptoSessionId);
+  std::move(init_cb).Run(Status::kOk, Protocol::kIntel,
+                         kClearKeyCdmProxyCryptoSessionId);
 }
 
 void ClearKeyCdmProxy::Process(Function function,

media/gpu/windows/d3d11_cdm_proxy_unittest.cc

@@ -53,8 +53,7 @@ class MockPowerMonitorSource : public base::PowerMonitorSource {
 
 // The values doesn't matter as long as this is consistently used thruout the
 // test.
-const CdmProxy::Protocol kTestProtocol =
-    CdmProxy::Protocol::kIntelConvergedSecurityAndManageabilityEngine;
+const CdmProxy::Protocol kTestProtocol = CdmProxy::Protocol::kIntel;
 const CdmProxy::Function kTestFunction =
     CdmProxy::Function::kIntelNegotiateCryptoSessionKeyExchange;
 const uint32_t kTestFunctionId = 123;

media/mojo/services/mojo_cdm_proxy.cc

@@ -43,9 +43,8 @@ cdm::CdmProxyClient::Protocol ToCdmProtocol(CdmProxy::Protocol protocol) {
   switch (protocol) {
     case CdmProxy::Protocol::kNone:
       return cdm::CdmProxyClient::Protocol::kNone;
-    case CdmProxy::Protocol::kIntelConvergedSecurityAndManageabilityEngine:
-      return cdm::CdmProxyClient::Protocol::
-          kIntelConvergedSecurityAndManageabilityEngine;
+    case CdmProxy::Protocol::kIntel:
+      return cdm::CdmProxyClient::Protocol::kIntel;
   }
 
   NOTREACHED() << "Unexpected protocol: " << static_cast<int32_t>(protocol);