Replace FilePath with base::FilePath in net.

Review URL: https://codereview.chromium.org/12218081

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181543 0039d316-1c4b-4281-b951-d872f2087c98

net/base/cert_test_util.cc

@@ -14,10 +14,10 @@
 namespace net {
 
 CertificateList CreateCertificateListFromFile(
-    const FilePath& certs_dir,
+    const base::FilePath& certs_dir,
     const std::string& cert_file,
     int format) {
-  FilePath cert_path = certs_dir.AppendASCII(cert_file);
+  base::FilePath cert_path = certs_dir.AppendASCII(cert_file);
   std::string cert_data;
   if (!file_util::ReadFileToString(cert_path, &cert_data))
     return CertificateList();
@@ -27,9 +27,9 @@ CertificateList CreateCertificateListFromFile(
 }
 
 scoped_refptr<X509Certificate> ImportCertFromFile(
-    const FilePath& certs_dir,
+    const base::FilePath& certs_dir,
     const std::string& cert_file) {
-  FilePath cert_path = certs_dir.AppendASCII(cert_file);
+  base::FilePath cert_path = certs_dir.AppendASCII(cert_file);
   std::string cert_data;
   if (!file_util::ReadFileToString(cert_path, &cert_data))
     return NULL;

net/base/cert_verify_proc_unittest.cc

@@ -152,7 +152,7 @@ TEST_F(CertVerifyProcTest, PaypalNullCertParsing) {
 // pass if error == ERR_CERT_DATE_INVALID.  TODO(wtc): generate test
 // certificates for this unit test. http://crbug.com/111742
 TEST_F(CertVerifyProcTest, IntermediateCARequireExplicitPolicy) {
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
 
   scoped_refptr<X509Certificate> server_cert =
       ImportCertFromFile(certs_dir, "www_us_army_mil_cert.der");
@@ -197,7 +197,7 @@ TEST_F(CertVerifyProcTest, IntermediateCARequireExplicitPolicy) {
 // SEC_ERROR_REVOKED_CERTIFICATE. This indicates a lack of revocation
 // status, i.e. that the revocation check is failing for some reason.
 TEST_F(CertVerifyProcTest, DISABLED_GlobalSignR3EVTest) {
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
 
   scoped_refptr<X509Certificate> server_cert =
       ImportCertFromFile(certs_dir, "2029_globalsign_com_cert.pem");
@@ -227,7 +227,7 @@ TEST_F(CertVerifyProcTest, DISABLED_GlobalSignR3EVTest) {
 // Test that verifying an ECDSA certificate doesn't crash on XP. (See
 // crbug.com/144466).
 TEST_F(CertVerifyProcTest, ECDSA_RSA) {
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
 
   scoped_refptr<X509Certificate> cert =
       ImportCertFromFile(certs_dir,
@@ -258,7 +258,7 @@ static bool IsWeakKeyType(const std::string& key_type) {
 }
 
 TEST_F(CertVerifyProcTest, RejectWeakKeys) {
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
   typedef std::vector<std::string> Strings;
   Strings key_types;
 
@@ -329,7 +329,7 @@ TEST_F(CertVerifyProcTest, RejectWeakKeys) {
 // pass if error == ERR_CERT_DATE_INVALID.  TODO(rsleevi): generate test
 // certificates for this unit test.  http://crbug.com/111730
 TEST_F(CertVerifyProcTest, ExtraneousMD5RootCert) {
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
 
   scoped_refptr<X509Certificate> server_cert =
       ImportCertFromFile(certs_dir, "images_etrade_wallst_com.pem");
@@ -363,7 +363,7 @@ TEST_F(CertVerifyProcTest, ExtraneousMD5RootCert) {
 
 // Test for bug 94673.
 TEST_F(CertVerifyProcTest, GoogleDigiNotarTest) {
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
 
   scoped_refptr<X509Certificate> server_cert =
       ImportCertFromFile(certs_dir, "google_diginotar.pem");
@@ -402,7 +402,7 @@ TEST_F(CertVerifyProcTest, DigiNotarCerts) {
     NULL,
   };
 
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
 
   for (size_t i = 0; kDigiNotarFilenames[i]; i++) {
     scoped_refptr<X509Certificate> diginotar_cert =
@@ -428,7 +428,7 @@ TEST_F(CertVerifyProcTest, DigiNotarCerts) {
 }
 
 TEST_F(CertVerifyProcTest, TestKnownRoot) {
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
   CertificateList certs = CreateCertificateListFromFile(
       certs_dir, "certse.pem", X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(3U, certs.size());
@@ -452,7 +452,7 @@ TEST_F(CertVerifyProcTest, TestKnownRoot) {
 }
 
 TEST_F(CertVerifyProcTest, PublicKeyHashes) {
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
   CertificateList certs = CreateCertificateListFromFile(
       certs_dir, "certse.pem", X509Certificate::FORMAT_AUTO);
   ASSERT_EQ(3U, certs.size());
@@ -492,7 +492,7 @@ TEST_F(CertVerifyProcTest, PublicKeyHashes) {
 // The Key Usage extension in this RSA SSL server certificate does not have
 // the keyEncipherment bit.
 TEST_F(CertVerifyProcTest, InvalidKeyUsage) {
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
 
   scoped_refptr<X509Certificate> server_cert =
       ImportCertFromFile(certs_dir, "invalid_key_usage_cert.der");
@@ -526,7 +526,7 @@ TEST_F(CertVerifyProcTest, InvalidKeyUsage) {
 // used to ensure that the actual, verified chain is being returned by
 // Verify().
 TEST_F(CertVerifyProcTest, VerifyReturnChainBasic) {
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
   CertificateList certs = CreateCertificateListFromFile(
       certs_dir, "x509_verify_results.chain.pem",
       X509Certificate::FORMAT_AUTO);
@@ -569,7 +569,7 @@ TEST_F(CertVerifyProcTest, VerifyReturnChainBasic) {
 // of intermediate certificates are combined, it's possible that order may
 // not be maintained.
 TEST_F(CertVerifyProcTest, VerifyReturnChainProperlyOrdered) {
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
   CertificateList certs = CreateCertificateListFromFile(
       certs_dir, "x509_verify_results.chain.pem",
       X509Certificate::FORMAT_AUTO);
@@ -610,7 +610,7 @@ TEST_F(CertVerifyProcTest, VerifyReturnChainProperlyOrdered) {
 // Test that Verify() filters out certificates which are not related to
 // or part of the certificate chain being verified.
 TEST_F(CertVerifyProcTest, VerifyReturnChainFiltersUnrelatedCerts) {
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
   CertificateList certs = CreateCertificateListFromFile(
       certs_dir, "x509_verify_results.chain.pem",
       X509Certificate::FORMAT_AUTO);
@@ -792,7 +792,7 @@ class CertVerifyProcWeakDigestTest
 
 TEST_P(CertVerifyProcWeakDigestTest, Verify) {
   WeakDigestTestData data = GetParam();
-  FilePath certs_dir = GetTestCertsDirectory();
+  base::FilePath certs_dir = GetTestCertsDirectory();
 
   ScopedTestRoot test_root;
   if (data.root_cert_filename) {

net/base/directory_lister.cc

@@ -94,7 +94,7 @@ void SortData(std::vector<DirectoryLister::DirectoryListerData>* data,
 
 }  // namespace
 
-DirectoryLister::DirectoryLister(const FilePath& dir,
+DirectoryLister::DirectoryLister(const base::FilePath& dir,
                                  DirectoryListerDelegate* delegate)
     : ALLOW_THIS_IN_INITIALIZER_LIST(
         core_(new Core(dir, false, ALPHA_DIRS_FIRST, this))),
@@ -103,7 +103,7 @@ DirectoryLister::DirectoryLister(const FilePath& dir,
   DCHECK(!dir.value().empty());
 }
 
-DirectoryLister::DirectoryLister(const FilePath& dir,
+DirectoryLister::DirectoryLister(const base::FilePath& dir,
                                  bool recursive,
                                  SortType sort,
                                  DirectoryListerDelegate* delegate)
@@ -126,7 +126,7 @@ void DirectoryLister::Cancel() {
   return core_->Cancel();
 }
 
-DirectoryLister::Core::Core(const FilePath& dir,
+DirectoryLister::Core::Core(const base::FilePath& dir,
                             bool recursive,
                             SortType sort,
                             DirectoryLister* lister)
@@ -166,7 +166,7 @@ void DirectoryLister::Core::StartInternal() {
 
   file_util::FileEnumerator file_enum(dir_, recursive_, types);
 
-  FilePath path;
+  base::FilePath path;
   std::vector<DirectoryListerData> file_data;
   while (lister_ && !(path = file_enum.Next()).empty()) {
     DirectoryListerData data;

net/base/directory_lister.h

@@ -27,7 +27,7 @@ class NET_EXPORT DirectoryLister  {
   // Represents one file found.
   struct DirectoryListerData {
     file_util::FileEnumerator::FindInfo info;
-    FilePath path;
+    base::FilePath path;
   };
 
   // Implement this class to receive directory entries.
@@ -55,10 +55,10 @@ class NET_EXPORT DirectoryLister  {
     FULL_PATH
   };
 
-  DirectoryLister(const FilePath& dir,
+  DirectoryLister(const base::FilePath& dir,
                   DirectoryListerDelegate* delegate);
 
-  DirectoryLister(const FilePath& dir,
+  DirectoryLister(const base::FilePath& dir,
                   bool recursive,
                   SortType sort,
                   DirectoryListerDelegate* delegate);
@@ -76,7 +76,7 @@ class NET_EXPORT DirectoryLister  {
  private:
   class Core : public base::RefCountedThreadSafe<Core> {
    public:
-    Core(const FilePath& dir,
+    Core(const base::FilePath& dir,
          bool recursive,
          SortType sort,
          DirectoryLister* lister);
@@ -98,7 +98,7 @@ class NET_EXPORT DirectoryLister  {
 
     void OnDone(int error);
 
-    FilePath dir_;
+    base::FilePath dir_;
     bool recursive_;
     SortType sort_;
     scoped_refptr<base::MessageLoopProxy> origin_loop_;

net/base/directory_lister_unittest.cc

@@ -84,11 +84,11 @@ class ListerDelegate : public DirectoryLister::DirectoryListerDelegate {
   bool recursive_;
   bool quit_loop_after_each_file_;
   std::vector<file_util::FileEnumerator::FindInfo> file_list_;
-  std::vector<FilePath> paths_;
+  std::vector<base::FilePath> paths_;
 };
 
 TEST(DirectoryListerTest, BigDirTest) {
-  FilePath path;
+  base::FilePath path;
   ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &path));
 
   ListerDelegate delegate(false, false);
@@ -101,7 +101,7 @@ TEST(DirectoryListerTest, BigDirTest) {
 }
 
 TEST(DirectoryListerTest, BigDirRecursiveTest) {
-  FilePath path;
+  base::FilePath path;
   ASSERT_TRUE(PathService::Get(base::DIR_EXE, &path));
 
   ListerDelegate delegate(true, false);
@@ -114,7 +114,7 @@ TEST(DirectoryListerTest, BigDirRecursiveTest) {
 }
 
 TEST(DirectoryListerTest, CancelTest) {
-  FilePath path;
+  base::FilePath path;
   ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &path));
 
   ListerDelegate delegate(false, true);

net/base/file_stream.cc

@@ -43,7 +43,7 @@ FileStream::~FileStream() {
   bound_net_log_.EndEvent(NetLog::TYPE_FILE_STREAM_ALIVE);
 }
 
-int FileStream::Open(const FilePath& path, int open_flags,
+int FileStream::Open(const base::FilePath& path, int open_flags,
                      const CompletionCallback& callback) {
   if (IsOpen()) {
     DLOG(FATAL) << "File is already open!";
@@ -56,7 +56,7 @@ int FileStream::Open(const FilePath& path, int open_flags,
   return ERR_IO_PENDING;
 }
 
-int FileStream::OpenSync(const FilePath& path, int open_flags) {
+int FileStream::OpenSync(const base::FilePath& path, int open_flags) {
   base::ThreadRestrictions::AssertIOAllowed();
 
   if (IsOpen()) {

net/base/file_stream_context.cc

@@ -36,7 +36,7 @@ void FileStream::Context::Orphan() {
   }
 }
 
-void FileStream::Context::OpenAsync(const FilePath& path,
+void FileStream::Context::OpenAsync(const base::FilePath& path,
                                     int open_flags,
                                     const CompletionCallback& callback) {
   DCHECK(!async_in_progress_);
@@ -55,7 +55,7 @@ void FileStream::Context::OpenAsync(const FilePath& path,
   async_in_progress_ = true;
 }
 
-int FileStream::Context::OpenSync(const FilePath& path, int open_flags) {
+int FileStream::Context::OpenSync(const base::FilePath& path, int open_flags) {
   DCHECK(!async_in_progress_);
 
   BeginOpenEvent(path);
@@ -143,14 +143,14 @@ int FileStream::Context::RecordAndMapError(int error,
   return net_error;
 }
 
-void FileStream::Context::BeginOpenEvent(const FilePath& path) {
+void FileStream::Context::BeginOpenEvent(const base::FilePath& path) {
   std::string file_name = path.AsUTF8Unsafe();
   bound_net_log_.BeginEvent(NetLog::TYPE_FILE_STREAM_OPEN,
                             NetLog::StringCallback("file_name", &file_name));
 }
 
 FileStream::Context::OpenResult FileStream::Context::OpenFileImpl(
-    const FilePath& path, int open_flags) {
+    const base::FilePath& path, int open_flags) {
   // FileStream::Context actually closes the file asynchronously, independently
   // from FileStream's destructor. It can cause problems for users wanting to
   // delete the file right after FileStream deletion. Thus we are always

net/base/file_stream_unittest.cc

@@ -49,10 +49,10 @@ class FileStreamTest : public PlatformTest {
     PlatformTest::TearDown();
   }
 
-  const FilePath temp_file_path() const { return temp_file_path_; }
+  const base::FilePath temp_file_path() const { return temp_file_path_; }
 
  private:
-  FilePath temp_file_path_;
+  base::FilePath temp_file_path_;
 };
 
 namespace {

net/base/filter.cc

@@ -178,8 +178,9 @@ void Filter::FixupEncodingTypes(
     GURL url;
     success = filter_context.GetURL(&url);
     DCHECK(success);
-    FilePath filename = FilePath().AppendASCII(url.ExtractFileName());
-    FilePath::StringType extension = filename.Extension();
+    base::FilePath filename =
+        base::FilePath().AppendASCII(url.ExtractFileName());
+    base::FilePath::StringType extension = filename.Extension();
 
     if (filter_context.IsDownload()) {
       // We don't want to decompress gzipped files when the user explicitly

net/base/gzip_filter_unittest.cc

@@ -61,7 +61,7 @@ class GZipUnitTest : public PlatformTest {
     gzip_encode_buffer_ = NULL;
 
     // Get the path of source data file.
-    FilePath file_path;
+    base::FilePath file_path;
     PathService::Get(base::DIR_SOURCE_ROOT, &file_path);
     file_path = file_path.AppendASCII("net");
     file_path = file_path.AppendASCII("data");