From 304f7d2a88beea9f2a6fe0ebc1affe66dc78a951 Mon Sep 17 00:00:00 2001
From: Aaron Vaage <vaage@google.com>
Date: Wed, 20 Sep 2017 11:00:45 -0700
Subject: [PATCH] Rename "crypto_handler" to "encryption_handler"

Change-Id: I44307fad6f4f0c4c2f8b61c3c6b07867859c9867
---
 packager/packager.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packager/packager.cc b/packager/packager.cc
index 2d97368a8c..6159f86cb1 100644
--- a/packager/packager.cc
+++ b/packager/packager.cc
@@ -398,7 +398,7 @@ std::shared_ptr<Muxer> CreateMuxer(const PackagingParams& packaging_params,
   return muxer;
 }
 
-std::shared_ptr<MediaHandler> CreateCryptoHandler(
+std::shared_ptr<MediaHandler> CreateEncryptionHandler(
     const PackagingParams& packaging_params,
     const StreamDescriptor& stream,
     KeySource* key_source) {
@@ -552,10 +552,10 @@ Status CreateRemuxJobs(const StreamDescriptorList& stream_descriptors,
         std::make_shared<ChunkingHandler>(packaging_params.chunking_params);
     handlers.push_back(chunking_handler);
 
-    std::shared_ptr<MediaHandler> crypto_handler = CreateCryptoHandler(
+    std::shared_ptr<MediaHandler> encryption_handler = CreateEncryptionHandler(
         packaging_params, *stream_iter, encryption_key_source);
-    if (crypto_handler) {
-      handlers.push_back(crypto_handler);
+    if (encryption_handler) {
+      handlers.push_back(encryption_handler);
     }
 
     // If trick_play_handler is available, muxer should already be connected to