Revert of media config: expand is_encrypted to a struct.

chromecast/media/cma/ipc_streamer/encryption_scheme_marshaller.cc

Index: chromecast/media/cma/ipc_streamer/encryption_scheme_marshaller.cc
diff --git a/chromecast/media/cma/ipc_streamer/encryption_scheme_marshaller.cc b/chromecast/media/cma/ipc_streamer/encryption_scheme_marshaller.cc
deleted file mode 100644
index a88cfc5ce6ce6418314579cf6f24ce0c7fe15465..0000000000000000000000000000000000000000
--- a/chromecast/media/cma/ipc_streamer/encryption_scheme_marshaller.cc
+++ /dev/null
@@ -1,54 +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 "chromecast/media/cma/ipc_streamer/encryption_scheme_marshaller.h"
-
-#include <stdint.h>
-
-#include "base/logging.h"
-#include "chromecast/media/cma/ipc/media_message.h"
-
-namespace chromecast {
-namespace media {
-
-namespace {
-
-class PatternSpecMarshaller {
- public:
-  static void Write(const ::media::EncryptionScheme::Pattern& pattern,
-                    MediaMessage* msg) {
-    CHECK(msg->WritePod(pattern.encrypt_blocks()));
-    CHECK(msg->WritePod(pattern.skip_blocks()));
-  }
-
-  static ::media::EncryptionScheme::Pattern Read(MediaMessage* msg) {
-    uint32_t encrypt_blocks;
-    uint32_t skip_blocks;
-    CHECK(msg->ReadPod(&encrypt_blocks));
-    CHECK(msg->ReadPod(&skip_blocks));
-    return ::media::EncryptionScheme::Pattern(encrypt_blocks, skip_blocks);
-  }
-};
-
-}  // namespace
-
-// static
-void EncryptionSchemeMarshaller::Write(
-    const ::media::EncryptionScheme& encryption_scheme,
-    MediaMessage* msg) {
-  CHECK(msg->WritePod(encryption_scheme.mode()));
-  PatternSpecMarshaller::Write(encryption_scheme.pattern(), msg);
-}
-
-// static
-::media::EncryptionScheme EncryptionSchemeMarshaller::Read(MediaMessage* msg) {
-  ::media::EncryptionScheme::CipherMode mode;
-  ::media::EncryptionScheme::Pattern pattern;
-  CHECK(msg->ReadPod(&mode));
-  pattern = PatternSpecMarshaller::Read(msg);
-  return ::media::EncryptionScheme(mode, pattern);
-}
-
-}  // namespace media
-}  // namespace chromecast