Revert 239280 "Move more file_util functions to base namespace."

trunk/src/net/android/keystore_unittest.cc

 // Copyright (c) 2013 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 <openssl/bn.h>
 #include <openssl/dsa.h>
 #include <openssl/ecdsa.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ skipping 99 matching lines @@
   return reinterpret_cast<unsigned char*>(WriteInto(str, size + 1));
 }
 
 // Load a given private key file into an EVP_PKEY.
 // |filename| is the key file path.
 // Returns a new EVP_PKEY on success, NULL on failure.
 EVP_PKEY* ImportPrivateKeyFile(const char* filename) {
   // Load file in memory.
   base::FilePath certs_dir = GetTestCertsDirectory();
   base::FilePath file_path = certs_dir.AppendASCII(filename);
-  ScopedStdioHandle handle(base::OpenFile(file_path, "rb"));
+  ScopedStdioHandle handle(
+      file_util::OpenFile(file_path, "rb"));
   if (!handle.get()) {
     LOG(ERROR) << "Could not open private key file: " << filename;
     return NULL;
   }
   // Assume it is PEM_encoded. Load it as an EVP_PKEY.
   EVP_PKEY* pkey = PEM_read_PrivateKey(handle.get(), NULL, NULL, NULL);
   if (!pkey) {
     LOG(ERROR) << "Could not load public key file: " << filename
                << ", " << GetOpenSSLErrorString();
     return NULL;
@@ skipping 28 matching lines @@
   if (!pkey.get())
     return false;
   return GetPrivateKeyPkcs8Bytes(pkey, pkcs8);
 }
 
 // Same as ImportPrivateKey, but for public ones.
 EVP_PKEY* ImportPublicKeyFile(const char* filename) {
   // Load file as PEM data.
   base::FilePath certs_dir = GetTestCertsDirectory();
   base::FilePath file_path = certs_dir.AppendASCII(filename);
-  ScopedStdioHandle handle(base::OpenFile(file_path, "rb"));
+  ScopedStdioHandle handle(file_util::OpenFile(file_path, "rb"));
   if (!handle.get()) {
     LOG(ERROR) << "Could not open public key file: " << filename;
     return NULL;
   }
   EVP_PKEY* pkey = PEM_read_PUBKEY(handle.get(), NULL, NULL, NULL);
   if (!pkey) {
     LOG(ERROR) << "Could not load public key file: " << filename
                << ", " << GetOpenSSLErrorString();
     return NULL;
   }
@@ skipping 535 matching lines @@
   std::string signature;
   DoKeySigningWithWrapper(wrapper_key.get(),
                           openssl_key.get(),
                           message,
                           &signature);
   ASSERT_TRUE(VerifyTestECDSASignature(message, signature));
 }
 
 }  // namespace android
 }  // namespace net