media config: expand is_encrypted to a struct.

chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc

Index: chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc
diff --git a/chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc b/chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc
index 8cd28aee5e53504e763a7546a6f0510790476cdd..9cdbe7ccbe84370d921953b34a1296994f210240 100644
--- a/chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc
+++ b/chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.cc
@@ -9,6 +9,7 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "chromecast/media/cma/ipc/media_message.h"
+#include "chromecast/media/cma/ipc_streamer/encryption_scheme_marshaller.h"
 #include "media/base/video_decoder_config.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
@@ -65,7 +66,7 @@ void VideoDecoderConfigMarshaller::Write(
   SizeMarshaller::Write(config.coded_size(), msg);
   RectMarshaller::Write(config.visible_rect(), msg);
   SizeMarshaller::Write(config.natural_size(), msg);
-  CHECK(msg->WritePod(config.is_encrypted()));
+  EncryptionSchemeMarshaller::Write(config.encryption_scheme(), msg);
   CHECK(msg->WritePod(config.extra_data().size()));
   if (!config.extra_data().empty())
     CHECK(msg->WriteBuffer(&config.extra_data()[0],
@@ -82,8 +83,8 @@ void VideoDecoderConfigMarshaller::Write(
   gfx::Size coded_size;
   gfx::Rect visible_rect;
   gfx::Size natural_size;
-  bool is_encrypted;
   size_t extra_data_size;
+  ::media::EncryptionScheme encryption_scheme;
   std::vector<uint8_t> extra_data;
 
   CHECK(msg->ReadPod(&codec));
@@ -93,7 +94,7 @@ void VideoDecoderConfigMarshaller::Write(
   coded_size = SizeMarshaller::Read(msg);
   visible_rect = RectMarshaller::Read(msg);
   natural_size = SizeMarshaller::Read(msg);
-  CHECK(msg->ReadPod(&is_encrypted));
+  encryption_scheme = EncryptionSchemeMarshaller::Read(msg);
   CHECK(msg->ReadPod(&extra_data_size));
 
   CHECK_GE(codec, ::media::kUnknownVideoCodec);
@@ -113,7 +114,7 @@ void VideoDecoderConfigMarshaller::Write(
   return ::media::VideoDecoderConfig(
       codec, profile, format, color_space,
       coded_size, visible_rect, natural_size,
-      extra_data, is_encrypted);
+      extra_data, encryption_scheme);
 }
 
 }  // namespace media