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

crypto/signature_creator_openssl.cc

 // Copyright (c) 2012 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/signature_creator.h"
 
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/stl_util.h"
 #include "crypto/openssl_util.h"
 #include "crypto/rsa_private_key.h"
 #include "crypto/scoped_openssl_types.h"
 
 namespace crypto {
 
 namespace {
 
 const EVP_MD* ToOpenSSLDigest(SignatureCreator::HashAlgorithm hash_alg) {
   switch (hash_alg) {
@@ skipping 40 matching lines @@
                             const uint8* data,
                             int data_len,
                             std::vector<uint8>* signature) {
   ScopedRSA rsa_key(EVP_PKEY_get1_RSA(key->key()));
   if (!rsa_key)
     return false;
   signature->resize(RSA_size(rsa_key.get()));
 
   unsigned int len = 0;
   if (!RSA_sign(ToOpenSSLDigestType(hash_alg), data, data_len,
-                vector_as_array(signature), &len, rsa_key.get())) {
+                signature->data(), &len, rsa_key.get())) {
     signature->clear();
     return false;
   }
   signature->resize(len);
   return true;
 }
 
 SignatureCreator::SignatureCreator()
     : sign_context_(EVP_MD_CTX_create()) {
 }
@@ skipping 12 matching lines @@
 
   // Determine the maximum length of the signature.
   size_t len = 0;
   if (!EVP_DigestSignFinal(sign_context_, NULL, &len)) {
     signature->clear();
     return false;
   }
   signature->resize(len);
 
   // Sign it.
-  if (!EVP_DigestSignFinal(sign_context_, vector_as_array(signature), &len)) {
+  if (!EVP_DigestSignFinal(sign_context_, signature->data(), &len)) {
     signature->clear();
     return false;
   }
   signature->resize(len);
   return true;
 }
 
 }  // namespace crypto