Componentize EncryptedMediaMessageFilter and rename it CdmMessageFilter.

content/browser/media/android/encrypted_media_message_filter_android.h

Index: content/browser/media/android/encrypted_media_message_filter_android.h
diff --git a/chrome/browser/media/encrypted_media_message_filter_android.h b/content/browser/media/android/encrypted_media_message_filter_android.h
similarity index 70%
rename from chrome/browser/media/encrypted_media_message_filter_android.h
rename to content/browser/media/android/encrypted_media_message_filter_android.h
index 9d426ae59a78faff34dc90cbd8bfbaccec5ff2e5..a477fcc2d186a23cb408616a98b11d4e23d10c7f 100644
--- a/chrome/browser/media/encrypted_media_message_filter_android.h
+++ b/content/browser/media/android/encrypted_media_message_filter_android.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MEDIA_ENCRYPTED_MEDIA_MESSAGE_FILTER_ANDROID_H_
-#define CHROME_BROWSER_MEDIA_ENCRYPTED_MEDIA_MESSAGE_FILTER_ANDROID_H_
+#ifndef CONTENT_BROWSER_MEDIA_ANDROID_ENCRYPTED_MEDIA_MESSAGE_FILTER_ANDROID_H_
+#define CONTENT_BROWSER_MEDIA_ANDROID_ENCRYPTED_MEDIA_MESSAGE_FILTER_ANDROID_H_
 
 #include "base/basictypes.h"
 #include "content/public/browser/browser_message_filter.h"
@@ -11,12 +11,11 @@
 struct SupportedKeySystemRequest;
 struct SupportedKeySystemResponse;
 
-namespace chrome {
+namespace content {
 
 // Message filter for EME on android. It is responsible for getting the
 // SupportedKeySystems information and passing it back to renderer.
-class EncryptedMediaMessageFilterAndroid
-    : public content::BrowserMessageFilter {
+class EncryptedMediaMessageFilterAndroid : public BrowserMessageFilter {
  public:
   EncryptedMediaMessageFilterAndroid();
 
@@ -27,8 +26,7 @@ class EncryptedMediaMessageFilterAndroid
   virtual bool OnMessageReceived(const IPC::Message& message,
                                  bool* message_was_ok) OVERRIDE;
   virtual void OverrideThreadForMessage(
-      const IPC::Message& message,
-      content::BrowserThread::ID* thread) OVERRIDE;
+      const IPC::Message& message, BrowserThread::ID* thread) OVERRIDE;
 
   // Retrieve the supported key systems.
   void OnGetSupportedKeySystems(
@@ -38,6 +36,6 @@ class EncryptedMediaMessageFilterAndroid
   DISALLOW_COPY_AND_ASSIGN(EncryptedMediaMessageFilterAndroid);
 };
 
-}  // namespace chrome
+}  // namespace content
 
-#endif  // CHROME_BROWSER_MEDIA_ENCRYPTED_MEDIA_MESSAGE_FILTER_ANDROID_H_
+#endif  // CONTENT_BROWSER_MEDIA_ANDROID_ENCRYPTED_MEDIA_MESSAGE_FILTER_ANDROID_H_