diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-18 06:14:59 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-18 06:14:59 +0000 |
commit | 631a54712d79c39bb7fbd322e3e4dc6b2429686d (patch) | |
tree | ecefa4d7d12d7dd79e489065c2555781bab9b5f5 /net | |
parent | e541ac7357c2178ee785764ab0415f94f5ec9bd7 (diff) | |
download | chromium_src-631a54712d79c39bb7fbd322e3e4dc6b2429686d.zip chromium_src-631a54712d79c39bb7fbd322e3e4dc6b2429686d.tar.gz chromium_src-631a54712d79c39bb7fbd322e3e4dc6b2429686d.tar.bz2 |
Fix more remaining FilePath -> base::FilePath.
This removes the "using" in file_path.h for Mac since Mac now passes trybots with no using. It still leaves the using for Windows.
Review URL: https://codereview.chromium.org/12294008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r-- | net/android/keystore_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/android/keystore_unittest.cc b/net/android/keystore_unittest.cc index b4c0504..46492c2 100644 --- a/net/android/keystore_unittest.cc +++ b/net/android/keystore_unittest.cc @@ -115,8 +115,8 @@ unsigned char* OpenSSLWriteInto(std::string* str, size_t size) { // Returns a new EVP_PKEY on success, NULL on failure. EVP_PKEY* ImportPrivateKeyFile(const char* filename) { // Load file in memory. - FilePath certs_dir = GetTestCertsDirectory(); - FilePath file_path = certs_dir.AppendASCII(filename); + base::FilePath certs_dir = GetTestCertsDirectory(); + base::FilePath file_path = certs_dir.AppendASCII(filename); ScopedStdioHandle handle( file_util::OpenFile(file_path, "rb")); if (!handle.get()) { @@ -165,8 +165,8 @@ bool ImportPrivateKeyFileAsPkcs8(const char* filename, // Same as ImportPrivateKey, but for public ones. EVP_PKEY* ImportPublicKeyFile(const char* filename) { // Load file as PEM data. - FilePath certs_dir = GetTestCertsDirectory(); - FilePath file_path = certs_dir.AppendASCII(filename); + base::FilePath certs_dir = GetTestCertsDirectory(); + base::FilePath file_path = certs_dir.AppendASCII(filename); ScopedStdioHandle handle(file_util::OpenFile(file_path, "rb")); if (!handle.get()) { LOG(ERROR) << "Could not open public key file: " << filename; |