Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2032)

Unified Diff: net/android/keystore_unittest.cc

Issue 12294008: Fix more remaining FilePath -> base::FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/gpu/gpu_info_collector_win.cc ('k') | testing/android/native_test_launcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/keystore_unittest.cc
diff --git a/net/android/keystore_unittest.cc b/net/android/keystore_unittest.cc
index b4c0504a1e4ea2f4743544c038dcbf7899c46270..46492c2b6785eb11625081815489198de091c3a9 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;
« no previous file with comments | « content/gpu/gpu_info_collector_win.cc ('k') | testing/android/native_test_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698