Componentize EncryptedMediaMessageFilter and rename it CdmMessageFilter.

content/browser/media/android/encrypted_media_message_filter_android.cc

Index: content/browser/media/android/encrypted_media_message_filter_android.cc
diff --git a/chrome/browser/media/encrypted_media_message_filter_android.cc b/content/browser/media/android/encrypted_media_message_filter_android.cc
similarity index 90%
rename from chrome/browser/media/encrypted_media_message_filter_android.cc
rename to content/browser/media/android/encrypted_media_message_filter_android.cc
index 7afbec803a99a695b58a5e51fda1466fd307f340..319b90630ac4feafef0cd8a1999e66b990294abd 100644
--- a/chrome/browser/media/encrypted_media_message_filter_android.cc
+++ b/content/browser/media/android/encrypted_media_message_filter_android.cc
@@ -2,21 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/media/encrypted_media_message_filter_android.h"
+#include "content/browser/media/android/encrypted_media_message_filter_android.h"
 
 #include <string>
 
-#include "chrome/common/encrypted_media_messages_android.h"
+#include "content/common/media/encrypted_media_messages_android.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/base/android/media_codec_bridge.h"
 #include "media/base/android/media_drm_bridge.h"
 
-using content::BrowserThread;
-using content::SupportedCodecs;
 using media::MediaCodecBridge;
 using media::MediaDrmBridge;
 
-namespace chrome {
+namespace content {
 
 const size_t kMaxKeySystemLength = 256;
 
@@ -74,7 +72,7 @@ bool EncryptedMediaMessageFilterAndroid::OnMessageReceived(
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(
       EncryptedMediaMessageFilterAndroid, message, *message_was_ok)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_GetSupportedKeySystems,
+    IPC_MESSAGE_HANDLER(ViewHostMsg_GetSupportedKeySystems,
                         OnGetSupportedKeySystems)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
@@ -84,7 +82,7 @@ bool EncryptedMediaMessageFilterAndroid::OnMessageReceived(
 void EncryptedMediaMessageFilterAndroid::OverrideThreadForMessage(
     const IPC::Message& message, BrowserThread::ID* thread) {
   // Move the IPC handling to FILE thread as it is not very cheap.
-  if (message.type() == ChromeViewHostMsg_GetSupportedKeySystems::ID)
+  if (message.type() == ViewHostMsg_GetSupportedKeySystems::ID)
     *thread = BrowserThread::FILE;
 }
 
@@ -111,4 +109,4 @@ void EncryptedMediaMessageFilterAndroid::OnGetSupportedKeySystems(
   response->non_compositing_codecs = GetSupportedCodecs(request, false);
 }
 
-}  // namespace chrome
+}  // namespace content