Revert of Refactor MediaCodecBridge to add support for NDK APIs

media/base/android/media_codec_decoder.cc

 // 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/android/media_codec_decoder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
@@ skipping 720 matching lines @@
     status = media_codec_bridge_->QueueInputBuffer(
         index, &unit->data[0], unit->data.size(), unit->timestamp);
   } else {
     DVLOG(2) << class_name() << "::" << __FUNCTION__
              << ": QueueSecureInputBuffer pts:" << unit->timestamp
              << " key_id size:" << unit->key_id.size()
              << " iv size:" << unit->iv.size()
              << " subsamples size:" << unit->subsamples.size();
 
     status = media_codec_bridge_->QueueSecureInputBuffer(
-        index, &unit->data[0], unit->data.size(), unit->key_id, unit->iv,
+        index, &unit->data[0], unit->data.size(),
+        reinterpret_cast<const uint8_t*>(&unit->key_id[0]), unit->key_id.size(),
+        reinterpret_cast<const uint8_t*>(&unit->iv[0]), unit->iv.size(),
         unit->subsamples.empty() ? nullptr : &unit->subsamples[0],
         unit->subsamples.size(), unit->timestamp);
   }
 
   switch (status) {
     case MEDIA_CODEC_OK:
       break;
 
     case MEDIA_CODEC_ERROR:
       DVLOG(0) << class_name() << "::" << __FUNCTION__
@@ skipping 208 matching lines @@
     RETURN_STRING(kStopping);
     RETURN_STRING(kInEmergencyStop);
     RETURN_STRING(kError);
   }
   return nullptr;  // crash early
 }
 
 #undef RETURN_STRING
 
 }  // namespace media