7 files changed, 8 insertions, 24 deletions
diff --git a/base/file_util.cc b/base/file_util.cc
index 4f69e00..1160e39 100644
--- a/base/file_util.cc
+++ b/base/file_util.cc
@@ -339,9 +339,6 @@ bool CopyDirectory(const std::wstring& from_path, const std::wstring& to_path,
                        FilePath::FromWStringHack(to_path),
                        recursive);
 }
-bool CreateDirectory(const std::wstring& full_path) {
-  return CreateDirectory(FilePath::FromWStringHack(full_path));
-}
 bool Delete(const std::wstring& path, bool recursive) {
   return Delete(FilePath::FromWStringHack(path), recursive);
 }
diff --git a/base/file_util.h b/base/file_util.h
index e97f498..7ec1dce 100644
--- a/base/file_util.h
+++ b/base/file_util.h
@@ -292,8 +292,6 @@ bool CreateNewTempDirectory(const FilePath::StringType& prefix,
 // don't exist. Returns 'true' on successful creation, or if the directory
 // already exists.  The directory is only readable by the current user.
 bool CreateDirectory(const FilePath& full_path);
-// Deprecated temporary compatibility function.
-bool CreateDirectory(const std::wstring& full_path);
 
 // Returns the file size. Returns true on success.
 bool GetFileSize(const FilePath& file_path, int64* file_size);
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index af7c9d5..1dcd72d 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -500,15 +500,10 @@ bool DownloadManager::Init(Profile* profile) {
 
   download_path_.Init(prefs::kDownloadDefaultDirectory, prefs, NULL);
 
-  // This variable is needed to resolve which CreateDirectory we want to point
-  // to. Without it, the NewRunnableFunction cannot resolve the ambiguity.
-  // TODO(estade): when file_util::CreateDirectory(wstring) is removed,
-  // get rid of |CreateDirectoryPtr|.
-  bool (*CreateDirectoryPtr)(const FilePath&) = &file_util::CreateDirectory;
   // Ensure that the download directory specified in the preferences exists.
   ChromeThread::PostTask(
       ChromeThread::FILE, FROM_HERE,
-      NewRunnableFunction(CreateDirectoryPtr, download_path()));
+      NewRunnableFunction(&file_util::CreateDirectory, download_path()));
 
   // We use this to determine possibly dangerous downloads.
   download_util::InitializeExeTypes(&exe_types_);
diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc
index 813e86f..a507ec7 100644
--- a/chrome/browser/gtk/download_item_gtk.cc
+++ b/chrome/browser/gtk/download_item_gtk.cc
@@ -218,10 +218,6 @@ DownloadItemGtk::DownloadItemGtk(DownloadShelfGtk* parent_shelf,
 
   name_label_ = gtk_label_new(NULL);
 
-  // TODO(estade): This is at best an educated guess, since we don't actually
-  // use gfx::Font() to draw the text. This is why we need to add so
-  // much padding when we set the size request. We need to either use gfx::Font
-  // or somehow extend TextElider.
   UpdateNameLabel();
 
   status_label_ = gtk_label_new(NULL);
@@ -532,6 +528,10 @@ void DownloadItemGtk::LoadIcon() {
 }
 
 void DownloadItemGtk::UpdateNameLabel() {
+  // TODO(estade): This is at best an educated guess, since we don't actually
+  // use gfx::Font() to draw the text. This is why we need to add so
+  // much padding when we set the size request. We need to either use gfx::Font
+  // or somehow extend TextElider.
   std::wstring elided_filename = gfx::ElideFilename(
       get_download()->GetFileName(),
       gfx::Font(), kTextWidth);
diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc
index 54b99aa..6cfbc51 100644
--- a/chrome/browser/gtk/find_bar_gtk.cc
+++ b/chrome/browser/gtk/find_bar_gtk.cc
@@ -391,12 +391,6 @@ void FindBarGtk::AudibleAlert() {
 }
 
 gfx::Rect FindBarGtk::GetDialogPosition(gfx::Rect avoid_overlapping_rect) {
-  // TODO(estade): Logic for the positioning of the find bar might do better
-  // to share more code with Windows. Currently though they do some things we
-  // don't worry about, such as considering the state of the bookmark bar on
-  // the NTP. I've tried to stick as close to the windows function as possible
-  // here to make it easy to possibly unfork this down the road.
-
   bool ltr = l10n_util::GetTextDirection() == l10n_util::LEFT_TO_RIGHT;
   // 15 is the size of the scrollbar, copied from ScrollbarThemeChromium.
   // The height is not used.
diff --git a/chrome/installer/util/lzma_util.cc b/chrome/installer/util/lzma_util.cc
index de5f824..3c232c7 100644
--- a/chrome/installer/util/lzma_util.cc
+++ b/chrome/installer/util/lzma_util.cc
@@ -172,13 +172,13 @@ DWORD LzmaUtil::UnPack(const std::wstring& location,
 
     // If archive entry is directory create it and move on to the next entry.
     if (f->IsDirectory) {
-      file_util::CreateDirectory(wfileName);
+      file_util::CreateDirectory(FilePath(wfileName));
       continue;
     }
 
     HANDLE hFile;
     std::wstring directory = file_util::GetDirectoryFromPath(wfileName);
-    file_util::CreateDirectory(directory);
+    file_util::CreateDirectory(FilePath(directory));
 
     hFile = CreateFile(wfileName.c_str(), GENERIC_WRITE, 0, NULL,
                        CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
diff --git a/net/tools/dump_cache/cache_dumper.h b/net/tools/dump_cache/cache_dumper.h
index 8a11269..916b1b4 100644
--- a/net/tools/dump_cache/cache_dumper.h
+++ b/net/tools/dump_cache/cache_dumper.h
@@ -57,7 +57,7 @@ class CacheDumper : public CacheDumpWriter {
 class DiskDumper : public CacheDumpWriter {
  public:
   DiskDumper(const std::wstring& path) : path_(path), entry_(NULL) {
-    file_util::CreateDirectory(path);
+    file_util::CreateDirectory(FilePath(path));
   };
   virtual bool CreateEntry(const std::string& key, disk_cache::Entry** entry);
   virtual bool WriteEntry(disk_cache::Entry* entry, int stream, int offset,