diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:43:30 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 21:43:30 +0000 |
| commit | 7600d0b2d5e37b211280d5109a6b726644d6be76 (patch) | |
| tree | 4ba2cb5383bb9ef5f610aeffe5d4455149da683b /net/android | |
| parent | a4f7378f973b38400f133958842eb36db0b61dcb (diff) | |
| download | chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.zip chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.tar.gz chromium_src-7600d0b2d5e37b211280d5109a6b726644d6be76.tar.bz2 | |
Revert 239400 "Revert 239280 "Move more file_util functions to b..."
Broke all bots 9_9
> 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
TBR=thakis@chromium.org
Review URL: https://codereview.chromium.org/100923007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239401 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android')
| -rw-r--r-- | net/android/keystore_unittest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/android/keystore_unittest.cc b/net/android/keystore_unittest.cc index 98944e2..58e3da7 100644 --- a/net/android/keystore_unittest.cc +++ b/net/android/keystore_unittest.cc @@ -117,8 +117,7 @@ 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( - file_util::OpenFile(file_path, "rb")); + ScopedStdioHandle handle(base::OpenFile(file_path, "rb")); if (!handle.get()) { LOG(ERROR) << "Could not open private key file: " << filename; return NULL; @@ -167,7 +166,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(file_util::OpenFile(file_path, "rb")); + ScopedStdioHandle handle(base::OpenFile(file_path, "rb")); if (!handle.get()) { LOG(ERROR) << "Could not open public key file: " << filename; return NULL; |