Step 2 in porting disk cache to using FilePath.

BUG=24444

Review URL: http://codereview.chromium.org/270066

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

10 files changed, 41 insertions, 19 deletions

diff --git a/base/platform_file.h b/base/platform_file.h
index 5d84262..0dbf4e4 100644
--- a/base/platform_file.h
+++ b/base/platform_file.h
@@ -12,6 +12,8 @@
 
 #include <string>
 
+class FilePath;
+
 namespace base {
 
 #if defined(OS_WIN)
@@ -40,6 +42,10 @@ enum PlatformFileFlags {
 // Creates or opens the given file. If PLATFORM_FILE_OPEN_ALWAYS is used, and
 // |created| is provided, |created| will be set to true if the file was created
 // or to false in case the file was just opened.
+PlatformFile CreatePlatformFile(const FilePath& name,
+                                int flags,
+                                bool* created);
+// Deprecated.
 PlatformFile CreatePlatformFile(const std::wstring& name,
                                 int flags,
                                 bool* created);
diff --git a/base/platform_file_posix.cc b/base/platform_file_posix.cc
index 623223c..46039b9 100644
--- a/base/platform_file_posix.cc
+++ b/base/platform_file_posix.cc
@@ -8,14 +8,14 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#include "base/file_path.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 
 namespace base {
 
 // TODO(erikkay): does it make sense to support PLATFORM_FILE_EXCLUSIVE_* here?
-PlatformFile CreatePlatformFile(const std::wstring& name,
-                                int flags,
+PlatformFile CreatePlatformFile(const FilePath& name, int flags,
                                 bool* created) {
   int open_flags = 0;
   if (flags & PLATFORM_FILE_CREATE)
@@ -43,8 +43,7 @@ PlatformFile CreatePlatformFile(const std::wstring& name,
 
   DCHECK(O_RDONLY == 0);
 
-  int descriptor = open(WideToUTF8(name).c_str(), open_flags,
-                        S_IRUSR | S_IWUSR);
+  int descriptor = open(name.value().c_str(), open_flags, S_IRUSR | S_IWUSR);
 
   if (flags & PLATFORM_FILE_OPEN_ALWAYS) {
     if (descriptor > 0) {
@@ -56,20 +55,24 @@ PlatformFile CreatePlatformFile(const std::wstring& name,
           flags & PLATFORM_FILE_EXCLUSIVE_WRITE) {
         open_flags |= O_EXCL;   // together with O_CREAT implies O_NOFOLLOW
       }
-      descriptor = open(WideToUTF8(name).c_str(), open_flags,
-                        S_IRUSR | S_IWUSR);
+      descriptor = open(name.value().c_str(), open_flags, S_IRUSR | S_IWUSR);
       if (created && descriptor > 0)
         *created = true;
     }
   }
 
   if ((descriptor > 0) && (flags & PLATFORM_FILE_DELETE_ON_CLOSE)) {
-    unlink(WideToUTF8(name).c_str());
+    unlink(name.value().c_str());
   }
 
   return descriptor;
 }
 
+PlatformFile CreatePlatformFile(const std::wstring& name, int flags,
+                                bool* created) {
+  return CreatePlatformFile(FilePath::FromWStringHack(name), flags, created);
+}
+
 bool ClosePlatformFile(PlatformFile file) {
   return close(file);
 }
diff --git a/base/platform_file_win.cc b/base/platform_file_win.cc
index 06e6200..1143487 100644
--- a/base/platform_file_win.cc
+++ b/base/platform_file_win.cc
@@ -4,11 +4,12 @@
 
 #include "base/platform_file.h"
 
+#include "base/file_path.h"
 #include "base/logging.h"
 
 namespace base {
 
-PlatformFile CreatePlatformFile(const std::wstring& name,
+PlatformFile CreatePlatformFile(const FilePath& name,
                                 int flags,
                                 bool* created) {
   DWORD disposition = 0;
@@ -54,8 +55,8 @@ PlatformFile CreatePlatformFile(const std::wstring& name,
   if (flags & PLATFORM_FILE_DELETE_ON_CLOSE)
     create_flags |= FILE_FLAG_DELETE_ON_CLOSE;
 
-  HANDLE file = CreateFile(name.c_str(), access, sharing, NULL, disposition,
-                           create_flags, NULL);
+  HANDLE file = CreateFile(name.value().c_str(), access, sharing, NULL,
+                           disposition, create_flags, NULL);
 
   if ((flags & PLATFORM_FILE_OPEN_ALWAYS) && created &&
       INVALID_HANDLE_VALUE != file) {
@@ -65,6 +66,11 @@ PlatformFile CreatePlatformFile(const std::wstring& name,
   return file;
 }
 
+PlatformFile CreatePlatformFile(const std::wstring& name, int flags,
+                                bool* created) {
+  return CreatePlatformFile(FilePath::FromWStringHack(name), flags, created);
+}
+
 bool ClosePlatformFile(PlatformFile file) {
   return (CloseHandle(file) == 0);
 }
diff --git a/net/disk_cache/block_files_unittest.cc b/net/disk_cache/block_files_unittest.cc
index 6256a3d..2ea930e 100644
--- a/net/disk_cache/block_files_unittest.cc
+++ b/net/disk_cache/block_files_unittest.cc
@@ -170,7 +170,7 @@ TEST_F(DiskCacheTest, BlockFiles_ZeroSizeFile) {
   // Truncate one of the files.
   {
     scoped_refptr<File> file(new File);
-    ASSERT_TRUE(file->Init(filename));
+    ASSERT_TRUE(file->Init(FilePath::FromWStringHack(filename)));
     EXPECT_TRUE(file->SetLength(0));
   }
 
diff --git a/net/disk_cache/entry_impl.cc b/net/disk_cache/entry_impl.cc
index 163f217..8749f26 100644
--- a/net/disk_cache/entry_impl.cc
+++ b/net/disk_cache/entry_impl.cc
@@ -692,7 +692,7 @@ File* EntryImpl::GetExternalFile(Addr address, int index) {
   if (!files_[index].get()) {
     // For a key file, use mixed mode IO.
     scoped_refptr<File> file(new File(kKeyFileIndex == index));
-    if (file->Init(backend_->GetFileName(address).ToWStringHack()))
+    if (file->Init(backend_->GetFileName(address)))
       files_[index].swap(file);
   }
   return files_[index].get();
diff --git a/net/disk_cache/file.h b/net/disk_cache/file.h
index 3c167db..76c2f79 100644
--- a/net/disk_cache/file.h
+++ b/net/disk_cache/file.h
@@ -12,6 +12,8 @@
 #include "base/platform_file.h"
 #include "base/ref_counted.h"
 
+class FilePath;
+
 namespace disk_cache {
 
 // This interface is used to support asynchronous ReadData and WriteData calls.
@@ -39,7 +41,7 @@ class File : public base::RefCounted<File> {
 
   // Initializes the object to point to a given file. The file must aready exist
   // on disk, and allow shared read and write.
-  bool Init(const std::wstring& name);
+  bool Init(const FilePath& name);
 
   // Returns the handle or file descriptor.
   base::PlatformFile platform_file() const;
diff --git a/net/disk_cache/file_posix.cc b/net/disk_cache/file_posix.cc
index b080f53..d3e903b 100644
--- a/net/disk_cache/file_posix.cc
+++ b/net/disk_cache/file_posix.cc
@@ -245,7 +245,7 @@ File::File(base::PlatformFile file)
     : init_(true), mixed_(true), platform_file_(file) {
 }
 
-bool File::Init(const std::wstring& name) {
+bool File::Init(const FilePath& name) {
   if (init_)
     return false;
 
diff --git a/net/disk_cache/file_win.cc b/net/disk_cache/file_win.cc
index b341caf..2b1f20b 100644
--- a/net/disk_cache/file_win.cc
+++ b/net/disk_cache/file_win.cc
@@ -4,6 +4,7 @@
 
 #include "net/disk_cache/file.h"
 
+#include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "net/disk_cache/disk_cache.h"
@@ -77,12 +78,13 @@ File::File(base::PlatformFile file)
       sync_platform_file_(file) {
 }
 
-bool File::Init(const std::wstring& name) {
+bool File::Init(const FilePath& name) {
   DCHECK(!init_);
   if (init_)
     return false;
 
-  platform_file_ = CreateFile(name.c_str(), GENERIC_READ | GENERIC_WRITE,
+  platform_file_ = CreateFile(name.value().c_str(),
+                              GENERIC_READ | GENERIC_WRITE,
                               FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                               OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
 
@@ -93,7 +95,8 @@ bool File::Init(const std::wstring& name) {
       platform_file_, Singleton<CompletionHandler>::get());
 
   init_ = true;
-  sync_platform_file_  = CreateFile(name.c_str(), GENERIC_READ | GENERIC_WRITE,
+  sync_platform_file_  = CreateFile(name.value().c_str(),
+                                    GENERIC_READ | GENERIC_WRITE,
                                     FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                                     OPEN_EXISTING, 0, NULL);
 
diff --git a/net/disk_cache/mapped_file_posix.cc b/net/disk_cache/mapped_file_posix.cc
index a28a7d4..6370ca6 100644
--- a/net/disk_cache/mapped_file_posix.cc
+++ b/net/disk_cache/mapped_file_posix.cc
@@ -7,6 +7,7 @@
 #include <errno.h>
 #include <sys/mman.h>
 
+#include "base/file_path.h"
 #include "base/logging.h"
 #include "net/disk_cache/disk_cache.h"
 
@@ -14,7 +15,7 @@ namespace disk_cache {
 
 void* MappedFile::Init(const std::wstring& name, size_t size) {
   DCHECK(!init_);
-  if (init_ || !File::Init(name))
+  if (init_ || !File::Init(FilePath::FromWStringHack(name)))
     return NULL;
 
   if (!size)
diff --git a/net/disk_cache/mapped_file_win.cc b/net/disk_cache/mapped_file_win.cc
index 4299df4..0692961 100644
--- a/net/disk_cache/mapped_file_win.cc
+++ b/net/disk_cache/mapped_file_win.cc
@@ -4,6 +4,7 @@
 
 #include "net/disk_cache/mapped_file.h"
 
+#include "base/file_path.h"
 #include "base/logging.h"
 #include "net/disk_cache/disk_cache.h"
 
@@ -11,7 +12,7 @@ namespace disk_cache {
 
 void* MappedFile::Init(const std::wstring& name, size_t size) {
   DCHECK(!init_);
-  if (init_ || !File::Init(name))
+  if (init_ || !File::Init(FilePath::FromWStringHack(name)))
     return NULL;
 
   buffer_ = NULL;