From 84b604b1b6950eceb84e664d3e93567b6aab22b3 Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Wed, 21 Apr 2010 21:41:30 +0000 Subject: Remove the wstring versions of GetFileInfo, GetFileSize, GetTempDir. TEST=compiles BUG=24672 Review URL: http://codereview.chromium.org/1753004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45246 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/safe_browsing/safe_browsing_database_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/safe_browsing') diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc index ea4a7684..c4ff493 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc @@ -1100,7 +1100,7 @@ void UpdateDatabase(const FilePath& initial_db, file_util::FileEnumerator file_enum(data_dir, false, file_util::FileEnumerator::FILES); while (true) { - std::wstring file = file_enum.Next().ToWStringHack(); + FilePath file = file_enum.Next(); if (file.empty()) break; @@ -1120,7 +1120,7 @@ void UpdateDatabase(const FilePath& initial_db, &re_key, info.chunks); CHECK(result); - info.listname = WideToASCII(file_util::GetFilenameFromPath(file)); + info.listname = WideToASCII(file.BaseName().ToWStringHack()); size_t index = info.listname.find('_'); // Get rid fo the _s or _a. info.listname.resize(index); info.listname.erase(0, 3); // Get rid of the 000 etc. -- cgit v1.1