diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-27 04:03:57 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-27 04:03:57 +0000 |
commit | b9e04f0654a99b6bb0b626df14e15ec4f9a8bf9d (patch) | |
tree | 3b738efc6107e6ea501790f0a8ba26c7d041ed3d /chrome | |
parent | f6c1f2470b243628a36981efae7c3a6ce3914a92 (diff) | |
download | chromium_src-b9e04f0654a99b6bb0b626df14e15ec4f9a8bf9d.zip chromium_src-b9e04f0654a99b6bb0b626df14e15ec4f9a8bf9d.tar.gz chromium_src-b9e04f0654a99b6bb0b626df14e15ec4f9a8bf9d.tar.bz2 |
Remove file_util::kPathSeparator from posix.
Review URL: http://codereview.chromium.org/12489
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_database_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc index a63765e..4fa984d 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc @@ -5,6 +5,7 @@ // Unit tests for the SafeBrowsing storage system. #include "base/command_line.h" +#include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" @@ -21,7 +22,6 @@ using base::Time; -static const wchar_t kSafeBrowsingTestDatabase[] = L"SafeBrowsingTestDatabase"; static const wchar_t kBloomSuffix[] = L" Bloom"; namespace { @@ -59,11 +59,10 @@ namespace { // Common database test set up code. std::wstring GetTestDatabaseName() { - std::wstring filename; + FilePath filename; PathService::Get(base::DIR_TEMP, &filename); - filename.push_back(file_util::kPathSeparator); - filename.append(kSafeBrowsingTestDatabase); - return filename; + filename = filename.Append(FILE_PATH_LITERAL("SafeBrowsingTestDatabase")); + return filename.ToWStringHack(); } SafeBrowsingDatabase* SetupTestDatabase() { @@ -1042,10 +1041,11 @@ void PeformUpdate(const std::wstring& initial_db, IoCounters before, after; #endif - std::wstring filename; - PathService::Get(base::DIR_TEMP, &filename); - filename.push_back(file_util::kPathSeparator); - filename.append(L"SafeBrowsingTestDatabase"); + FilePath path; + PathService::Get(base::DIR_TEMP, &path); + path = path.Append(FILE_PATH_LITERAL("SafeBrowsingTestDatabase")); + std::wstring filename = path.ToWStringHack(); + // In case it existed from a previous run. file_util::Delete(filename, false); |