Revert of media config: expand is_encrypted to a struct.

media/base/encryption_scheme.cc

Index: media/base/encryption_scheme.cc
diff --git a/media/base/encryption_scheme.cc b/media/base/encryption_scheme.cc
deleted file mode 100644
index 70d133c65ab4612fc69d020aa7c3a5de5023acc5..0000000000000000000000000000000000000000
--- a/media/base/encryption_scheme.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015 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 "media/base/encryption_scheme.h"
-
-namespace media {
-
-EncryptionScheme::Pattern::Pattern() {}
-
-EncryptionScheme::Pattern::Pattern(uint32_t encrypt_blocks,
-                                   uint32_t skip_blocks)
-    : encrypt_blocks_(encrypt_blocks), skip_blocks_(skip_blocks) {}
-
-EncryptionScheme::Pattern::~Pattern() {}
-
-bool EncryptionScheme::Pattern::Matches(const Pattern& other) const {
-  return encrypt_blocks_ == other.encrypt_blocks() &&
-         skip_blocks_ == other.skip_blocks();
-}
-
-bool EncryptionScheme::Pattern::IsInEffect() const {
-  return encrypt_blocks_ != 0 && skip_blocks_ != 0;
-}
-
-EncryptionScheme::EncryptionScheme() {}
-
-EncryptionScheme::EncryptionScheme(CipherMode mode, const Pattern& pattern)
-    : mode_(mode), pattern_(pattern) {}
-
-EncryptionScheme::~EncryptionScheme() {}
-
-bool EncryptionScheme::Matches(const EncryptionScheme& other) const {
-  return mode_ == other.mode_ && pattern_.Matches(other.pattern_);
-}
-
-}  // namespace media