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

crypto/hmac_openssl.cc

Index: crypto/hmac_openssl.cc
diff --git a/crypto/hmac_openssl.cc b/crypto/hmac_openssl.cc
index ef20290e223200959674baf2d5f4db647b9d2cba..8f043f16c223fffbf6b659c5c5b4abc4a234b118 100644
--- a/crypto/hmac_openssl.cc
+++ b/crypto/hmac_openssl.cc
@@ -48,7 +48,7 @@ bool HMAC::Sign(const base::StringPiece& data,
 
   ScopedOpenSSLSafeSizeBuffer<EVP_MAX_MD_SIZE> result(digest, digest_length);
   return !!::HMAC(hash_alg_ == SHA1 ? EVP_sha1() : EVP_sha256(),
-                  vector_as_array(&plat_->key), plat_->key.size(),
+                  plat_->key.data(), plat_->key.size(),
                   reinterpret_cast<const unsigned char*>(data.data()),
                   data.size(), result.safe_buffer(), NULL);
 }