diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 17:50:31 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 17:50:31 +0000 |
| commit | b647e0b22430373766687242da51ee1453a19558 (patch) | |
| tree | f6f67aa96441563d779d3bea9b84ceede26812c5 /chrome/browser/safe_browsing | |
| parent | 4c70b7a559f7188a2820b38e6dad2758a310b55c (diff) | |
| download | chromium_src-b647e0b22430373766687242da51ee1453a19558.zip chromium_src-b647e0b22430373766687242da51ee1453a19558.tar.gz chromium_src-b647e0b22430373766687242da51ee1453a19558.tar.bz2 | |
Deprecate wstring version of PathService::Get() in unit tests.
Review URL: http://codereview.chromium.org/100292
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15221 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing')
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_database_unittest.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc index d49dc66..94a9a52 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc @@ -4,7 +4,6 @@ // // Unit tests for the SafeBrowsing storage system. -#include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" @@ -1029,15 +1028,15 @@ void PrintStat(const char* name) { } std::wstring GetFullSBDataPath(const std::wstring& path) { - std::wstring full_path; + FilePath full_path; CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &full_path)); - file_util::AppendToPath(&full_path, L"chrome"); - file_util::AppendToPath(&full_path, L"test"); - file_util::AppendToPath(&full_path, L"data"); - file_util::AppendToPath(&full_path, L"safe_browsing"); - file_util::AppendToPath(&full_path, path); + full_path = full_path.AppendASCII("chrome"); + full_path = full_path.AppendASCII("test"); + full_path = full_path.AppendASCII("data"); + full_path = full_path.AppendASCII("safe_browsing"); + full_path = full_path.Append(FilePath::FromWStringHack(path)); CHECK(file_util::PathExists(full_path)); - return full_path; + return full_path.ToWStringHack(); } struct ChunksInfo { |