diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:31:42 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:31:42 +0000 |
| commit | a4f7378f973b38400f133958842eb36db0b61dcb (patch) | |
| tree | 3ffb843e14698a63c4b5f1bac43cdcf1f4e1402e /net/android | |
| parent | 76b4b15804dafa5e586738bd7c8ac12fea6ddec2 (diff) | |
| download | chromium_src-a4f7378f973b38400f133958842eb36db0b61dcb.zip chromium_src-a4f7378f973b38400f133958842eb36db0b61dcb.tar.gz chromium_src-a4f7378f973b38400f133958842eb36db0b61dcb.tar.bz2 | |
Revert 239280 "Move more file_util functions to base namespace."
dbus_unittests started fialing on Linux Tests (dbg)(2) and Linux Tests (dbg)(2)(32).
This CL is the only in the intersection of CLs in the first failing build on
the two builders, so giving a speculative revert a try (rlarocque already
tried a clobber, it didn't help).
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29/builds/41806
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29%2832%29/builds/8544
> Move more file_util functions to base namespace.
>
> TBR=sky
>
> Review URL: https://codereview.chromium.org/109043002
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/105823009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android')
| -rw-r--r-- | net/android/keystore_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/android/keystore_unittest.cc b/net/android/keystore_unittest.cc index 58e3da7..98944e2 100644 --- a/net/android/keystore_unittest.cc +++ b/net/android/keystore_unittest.cc @@ -117,7 +117,8 @@ 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; @@ -166,7 +167,7 @@ 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; |