Componentize EncryptedMediaMessageFilter and rename it CdmMessageFilter.

android_webview/renderer/aw_key_systems.cc

Index: android_webview/renderer/aw_key_systems.cc
diff --git a/android_webview/renderer/aw_key_systems.cc b/android_webview/renderer/aw_key_systems.cc
index b276c88f5a4596fb222f8936d769ae355dfd79c3..fb17c01b506a55c129fa6bbaace09800b3e6b6da 100644
--- a/android_webview/renderer/aw_key_systems.cc
+++ b/android_webview/renderer/aw_key_systems.cc
@@ -3,45 +3,13 @@
 // found in the LICENSE file.
 
 #include "android_webview/renderer/aw_key_systems.h"
-
-#include <string>
-
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "content/public/common/eme_codec.h"
-#include "third_party/widevine/cdm/widevine_cdm_common.h"
-
-using content::KeySystemInfo;
-
-namespace {
-
-// Return |name|'s parent key system.
-std::string GetDirectParentName(const std::string& name) {
-  int last_period = name.find_last_of('.');
-  DCHECK_GT(last_period, 0);
-  return name.substr(0, last_period);
-}
-
-void AddWidevineWithCodecs(const std::string& key_system_name,
-                           bool add_parent_name,
-                           std::vector<KeySystemInfo>* concrete_key_systems) {
-  KeySystemInfo info(key_system_name);
-
-  if (add_parent_name)
-    info.parent_key_system = GetDirectParentName(key_system_name);
-
-  info.supported_codecs = content::EME_CODEC_MP4_ALL;
-
-  concrete_key_systems->push_back(info);
-}
-
-}  // namespace
+#include "components/cdm/renderer/widevine_key_systems.h"
 
 namespace android_webview {
 
 void AwAddKeySystems(
-    std::vector<KeySystemInfo>* key_systems_info) {
-  AddWidevineWithCodecs(kWidevineKeySystem, true, key_systems_info);
+    std::vector<content::KeySystemInfo>* key_systems_info) {
+  cdm::AddAndroidWidevine(key_systems_info);
 }
 
 }  // namespace android_webview