Componentize EncryptedMediaMessageFilter and rename it CdmMessageFilter.

components/cdm/renderer/widevine_key_systems.cc

+// Copyright 2014 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.
+
+#include "components/cdm/renderer/widevine_key_systems.h"
+
+#include <string>
+#include <vector>
+
+#include "base/logging.h"
+#include "components/cdm/common/encrypted_media_messages_android.h"
+#include "content/public/renderer/key_system_info.h"
+#include "content/public/renderer/render_thread.h"
+
+#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
+
+using content::KeySystemInfo;
+using content::SupportedCodecs;
+
+namespace cdm {
+
+#if defined(WIDEVINE_CDM_AVAILABLE)

[ddorwin, 2014/05/02 17:58:55]

This can be outside the namespace (at line 17).

[ycheo (away), 2014/05/05 10:15:08]

Done.

+enum WidevineCdmType {
+  WIDEVINE,
+  WIDEVINE_HR_NON_COMPOSITING,
+};
+
+// Return |name|'s parent key system.
+static std::string GetDirectParentName(std::string name) {
+  int last_period = name.find_last_of('.');
+  DCHECK_GT(last_period, 0);
+  return name.substr(0, last_period);
+}
+
+static void AddWidevineWithCodecs(

[ddorwin, 2014/05/02 17:58:55]

This function (and the one above) is now duplicated. This is likely to lead to
bugs where we forget to update Android and developer pain when this Android-only
code gets broken by desktop changes (or vice versa).

I think this should be the home for as much of the Widevine registration logic
on all platforms. (AddPepperBasedWidevine() is probably fine where it is since
it assumes other parts of chrome/ code.)

[ycheo (away), 2014/05/05 10:15:08]

Done.

+    WidevineCdmType widevine_cdm_type,
+    SupportedCodecs supported_codecs,
+    std::vector<KeySystemInfo>* concrete_key_systems) {
+  KeySystemInfo info(kWidevineKeySystem);
+
+  switch (widevine_cdm_type) {
+    case WIDEVINE:
+      // For standard Widevine, add parent name.
+      info.parent_key_system = GetDirectParentName(kWidevineKeySystem);
+      break;
+    case WIDEVINE_HR_NON_COMPOSITING:
+      info.key_system.append(".hrnoncompositing");
+      break;
+    default:
+      NOTREACHED();
+  }
+
+  // TODO(xhwang): A container or an initDataType may be supported even though
+  // there are no codecs supported in that container. Fix this when we support
+  // initDataType.
+  info.supported_codecs = supported_codecs;
+
+  concrete_key_systems->push_back(info);
+}
+
+void AddAndroidWidevine(
+    std::vector<KeySystemInfo>* concrete_key_systems) {
+  SupportedKeySystemRequest request;
+  SupportedKeySystemResponse response;
+
+  request.key_system = kWidevineKeySystem;
+  request.codecs = content::EME_CODEC_WEBM_ALL | content::EME_CODEC_MP4_ALL;
+  content::RenderThread::Get()->Send(
+      new ChromeViewHostMsg_GetSupportedKeySystems(request, &response));
+  DCHECK(response.compositing_codecs & content::EME_CODEC_ALL)
+      << "unrecognized codec";
+  DCHECK(response.non_compositing_codecs & content::EME_CODEC_ALL)
+      << "unrecognized codec";
+  if (response.compositing_codecs != content::EME_CODEC_NONE) {
+    AddWidevineWithCodecs(
+        WIDEVINE,
+        static_cast<SupportedCodecs>(response.compositing_codecs),
+        concrete_key_systems);
+  }
+
+  if (response.non_compositing_codecs != content::EME_CODEC_NONE) {
+    AddWidevineWithCodecs(
+        WIDEVINE_HR_NON_COMPOSITING,
+        static_cast<SupportedCodecs>(response.non_compositing_codecs),
+        concrete_key_systems);
+  }
+}
+#endif  // defined(WIDEVINE_CDM_AVAILABLE)
+
+}  // namespace cdm