From c1c3635c595274a684d42df4a4960b8f4ce03a70 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Mon, 27 Oct 2014 19:15:15 -0700
Subject: [PATCH] backout c7e523e3d339 (bug 1083373 part 2) for Android debug
 build warning, treated as error

---
 media/gmp-clearkey/0.1/ClearKeyUtils.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/media/gmp-clearkey/0.1/ClearKeyUtils.cpp b/media/gmp-clearkey/0.1/ClearKeyUtils.cpp
index 5832fcda3891..123ca2464cb3 100644
--- a/media/gmp-clearkey/0.1/ClearKeyUtils.cpp
+++ b/media/gmp-clearkey/0.1/ClearKeyUtils.cpp
@@ -10,8 +10,6 @@
 #include <vector>
 
 #include "ClearKeyUtils.h"
-#include "mozilla/ArrayUtils.h"
-#include "mozilla/Assertions.h"
 #include "mozilla/Endian.h"
 #include "mozilla/NullPtr.h"
 #include "openaes/oaes_lib.h"
@@ -108,12 +106,7 @@ EncodeBase64Web(vector<uint8_t> aBinary, string& aEncoded)
     out[i] += (*data >> (shift + 2)) & sMask;
     shift = (shift + 2) % 8;
 
-    auto idx = out[i];
-    MOZ_ASSERT(idx >= 0 &&
-               static_cast<size_t>(idx) < MOZ_ARRAY_LENGTH(sAlphabet),
-               "out of bounds index for 'sAlphabet'");
-    // Cast idx to size_t to pacify clang 'Wchar-subscripts' warning:
-    out[i] = sAlphabet[static_cast<size_t>(idx)];
+    out[i] = sAlphabet[out[i]];
   }
 
   return true;