Cleanup base/stl_util

crypto/rsa_private_key_openssl.cc

 // Copyright (c) 2011 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/rsa_private_key.h"
 
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>
 #include <openssl/rsa.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/stl_util-inl.h"
+#include "base/stl_util.h"
 #include "crypto/openssl_util.h"
 
 namespace crypto {
 
 namespace {
 
 // Function pointer definition, for injecting the required key export function
 // into ExportKey, below. The supplied function should export EVP_PKEY into
 // the supplied BIO, returning 1 on success or 0 on failure.
 typedef int (ExportFunction)(BIO*, EVP_PKEY*);
@@ skipping 10 matching lines @@
 
   int res = export_fn(bio.get(), key);
   if (!res)
     return false;
 
   char* data = NULL;
   long len = BIO_get_mem_data(bio.get(), &data);
   if (!data || len < 0)
     return false;
 
-  STLAssignToVector(output, reinterpret_cast<const uint8*>(data), len);
+  std::vector<uint8> for_output(data, data + len);
+  output->swap(for_output);
   return true;
 }
 
 }  // namespace
 
 // static
 RSAPrivateKey* RSAPrivateKey::Create(uint16 num_bits) {
   OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
   ScopedOpenSSL<RSA, RSA_free> rsa_key(RSA_new());
@@ skipping 71 matching lines @@
 
 bool RSAPrivateKey::ExportPrivateKey(std::vector<uint8>* output) {
   return ExportKey(key_, i2d_PKCS8PrivateKeyInfo_bio, output);
 }
 
 bool RSAPrivateKey::ExportPublicKey(std::vector<uint8>* output) {
   return ExportKey(key_, i2d_PUBKEY_bio, output);
 }
 
 }  // namespace crypto