Make vector_as_array use std::vector::data and switch a few directories.

crypto/nss_key_util.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 "crypto/nss_key_util.h"
 
 #include <cryptohi.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "crypto/nss_util.h"
 
 #if defined(USE_NSS_CERTS)
 #include <secmod.h>
 #include "crypto/nss_util_internal.h"
 #endif
 
 namespace crypto {
 
 namespace {
 
 #if defined(USE_NSS_CERTS)
 
 struct PublicKeyInfoDeleter {
   inline void operator()(CERTSubjectPublicKeyInfo* spki) {
     SECKEY_DestroySubjectPublicKeyInfo(spki);
   }
 };
 
 typedef scoped_ptr<CERTSubjectPublicKeyInfo, PublicKeyInfoDeleter>
     ScopedPublicKeyInfo;
 
 // Decodes |input| as a SubjectPublicKeyInfo and returns a SECItem containing
 // the CKA_ID of that public key or nullptr on error.
 ScopedSECItem MakeIDFromSPKI(const std::vector<uint8_t>& input) {
   // First, decode and save the public key.
   SECItem key_der;
   key_der.type = siBuffer;
-  key_der.data = const_cast<unsigned char*>(vector_as_array(&input));
+  key_der.data = const_cast<unsigned char*>(input.data());
   key_der.len = input.size();
 
   ScopedPublicKeyInfo spki(SECKEY_DecodeDERSubjectPublicKeyInfo(&key_der));
   if (!spki)
     return nullptr;
 
   ScopedSECKEYPublicKey result(SECKEY_ExtractPublicKey(spki.get()));
   if (!result)
     return nullptr;
 
@@ skipping 35 matching lines @@
     const std::vector<uint8_t>& input,
     bool permanent) {
   DCHECK(slot);
 
   ScopedPLArenaPool arena(PORT_NewArena(DER_DEFAULT_CHUNKSIZE));
   DCHECK(arena);
 
   // Excess data is illegal, but NSS silently accepts it, so first ensure that
   // |input| consists of a single ASN.1 element.
   SECItem input_item;
-  input_item.data = const_cast<unsigned char*>(vector_as_array(&input));
+  input_item.data = const_cast<unsigned char*>(input.data());
   input_item.len = input.size();
   SECItem der_private_key_info;
   SECStatus rv =
       SEC_QuickDERDecodeItem(arena.get(), &der_private_key_info,
                              SEC_ASN1_GET(SEC_AnyTemplate), &input_item);
   if (rv != SECSuccess)
     return nullptr;
 
   // Allow the private key to be used for key unwrapping, data decryption,
   // and signature generation.
@@ skipping 46 matching lines @@
   if (!cka_id)
     return nullptr;
 
   return ScopedSECKEYPrivateKey(
       PK11_FindKeyByKeyID(slot, cka_id.get(), nullptr));
 }
 
 #endif  // defined(USE_NSS_CERTS)
 
 }  // namespace crypto