Lands http://codereview.chromium.org/214030 for Thiago:

Avoids the unnecessary conversion to wstring when calling the WriteBookmarks function, using FilePath instead.

BUG=None
TEST=run unit_tests.exe

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

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

5 files changed, 7 insertions, 11 deletions

diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 9348198..a684562 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -6,7 +6,6 @@
 
 #include "app/l10n_util.h"
 #include "base/file_path.h"
-#include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/platform_file.h"
 #include "base/scoped_ptr.h"
@@ -319,13 +318,12 @@ class Writer : public Task {
 
 void WriteBookmarks(MessageLoop* thread,
                     BookmarkModel* model,
-                    const std::wstring& path) {
+                    const FilePath& path) {
   // BookmarkModel isn't thread safe (nor would we want to lock it down
   // for the duration of the write), as such we make a copy of the
   // BookmarkModel using BookmarkCodec then write from that.
   BookmarkCodec codec;
-  scoped_ptr<Writer> writer(new Writer(codec.Encode(model),
-                            FilePath::FromWStringHack(path)));
+  scoped_ptr<Writer> writer(new Writer(codec.Encode(model), path));
   if (thread)
     thread->PostTask(FROM_HERE, writer.release());
   else
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.h b/chrome/browser/bookmarks/bookmark_html_writer.h
index f6b1830..97ff5731 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.h
+++ b/chrome/browser/bookmarks/bookmark_html_writer.h
@@ -5,9 +5,8 @@
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_HTML_WRITER_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_HTML_WRITER_H_
 
-#include <string>
-
 class BookmarkModel;
+class FilePath;
 class MessageLoop;
 
 namespace bookmark_html_writer {
@@ -20,7 +19,7 @@ namespace bookmark_html_writer {
 // TODO(sky): need a callback on failure.
 void WriteBookmarks(MessageLoop* thread,
                     BookmarkModel* model,
-                    const std::wstring& path);
+                    const FilePath& path);
 
 }
 
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index 499189a..5f35d24 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -106,7 +106,7 @@ TEST_F(BookmarkHTMLWriterTest, DISABLED_Test) {
                               url4, t4);
 
   // Write to a temp file.
-  bookmark_html_writer::WriteBookmarks(NULL, &model, path_.ToWStringHack());
+  bookmark_html_writer::WriteBookmarks(NULL, &model, path_);
 
   // Read the bookmarks back in.
   std::vector<ProfileWriter::BookmarkEntry> parsed_bookmarks;
diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc
index aa8f0bc..5ee3d53 100644
--- a/chrome/browser/gtk/bookmark_manager_gtk.cc
+++ b/chrome/browser/gtk/bookmark_manager_gtk.cc
@@ -1422,8 +1422,7 @@ void BookmarkManagerGtk::FileSelected(const FilePath& path,
   } else if (id == IDS_BOOKMARK_MANAGER_EXPORT_MENU) {
     if (g_browser_process->io_thread()) {
       bookmark_html_writer::WriteBookmarks(
-          g_browser_process->io_thread()->message_loop(), model_,
-          path.ToWStringHack());
+          g_browser_process->io_thread()->message_loop(), model_, path);
     }
   } else {
     NOTREACHED();
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 5203346..313bc09 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -580,7 +580,7 @@ void BookmarkManagerView::FileSelected(const FilePath& path,
     if (g_browser_process->io_thread()) {
       bookmark_html_writer::WriteBookmarks(
           g_browser_process->io_thread()->message_loop(), GetBookmarkModel(),
-          path.ToWStringHack());
+          path);
     }
   } else {
     NOTREACHED();