Revert 147169 - Add support for encrypted WebM files as defined in the RFC.

media/webm/webm_content_encodings_client.cc

Index: media/webm/webm_content_encodings_client.cc
===================================================================
--- media/webm/webm_content_encodings_client.cc	(revision 147171)
+++ media/webm/webm_content_encodings_client.cc	(working copy)
@@ -50,11 +50,6 @@
     return this;
   }
 
-  if (id == kWebMIdContentEncAESSettings) {
-    DCHECK(cur_content_encoding_.get());
-    return this;
-  }
-
   // This should not happen if WebMListParser is working properly.
   DCHECK(false);
   return NULL;
@@ -126,13 +121,6 @@
     return true;
   }
 
-  if (id == kWebMIdContentEncAESSettings) {
-    if (cur_content_encoding_->cipher_mode() ==
-        ContentEncoding::kCipherModeInvalid)
-      cur_content_encoding_->set_cipher_mode(ContentEncoding::kCipherModeCtr);
-    return true;
-  }
-
   // This should not happen if WebMListParser is working properly.
   DCHECK(false);
   return false;
@@ -218,23 +206,6 @@
     return true;
   }
 
-  if (id == kWebMIdAESSettingsCipherMode) {
-    if (cur_content_encoding_->cipher_mode() !=
-        ContentEncoding::kCipherModeInvalid) {
-      DVLOG(1) << "Unexpected multiple AESSettingsCipherMode.";
-      return false;
-    }
-
-    if (val != ContentEncoding::kCipherModeCtr) {
-      DVLOG(1) << "Unexpected AESSettingsCipherMode " << val << ".";
-      return false;
-    }
-
-    cur_content_encoding_->set_cipher_mode(
-        static_cast<ContentEncoding::CipherMode>(val));
-    return true;
-  }
-
   // This should not happen if WebMListParser is working properly.
   DCHECK(false);
   return false;