summaryrefslogtreecommitdiffstats
path: root/chrome/browser/privacy_blacklist
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 20:00:14 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 20:00:14 +0000
commit53c5804ed27befcf9305e0963bf5318221209ca3 (patch)
tree7c8a558cb152e6d6f821cd927951f13f5451f531 /chrome/browser/privacy_blacklist
parent6f6f21ab8e11c252affd2dc3d1b4c1975cb18b15 (diff)
downloadchromium_src-53c5804ed27befcf9305e0963bf5318221209ca3.zip
chromium_src-53c5804ed27befcf9305e0963bf5318221209ca3.tar.gz
chromium_src-53c5804ed27befcf9305e0963bf5318221209ca3.tar.bz2
Avoids the use of ToWStringHack in a few places.
BUG=None TEST=run app_unittests.exe, browser_tests.exe and selenium_tests.exe Review URL: http://codereview.chromium.org/173418 Patch from Thiago Farina <thiago.farina@gmail.com>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/privacy_blacklist')
-rw-r--r--chrome/browser/privacy_blacklist/blacklist_unittest.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/privacy_blacklist/blacklist_unittest.cc b/chrome/browser/privacy_blacklist/blacklist_unittest.cc
index f7648b5..f979aaf 100644
--- a/chrome/browser/privacy_blacklist/blacklist_unittest.cc
+++ b/chrome/browser/privacy_blacklist/blacklist_unittest.cc
@@ -13,12 +13,11 @@
TEST(BlacklistTest, Generic) {
// Get path relative to test data dir.
- std::wstring input;
+ FilePath input;
PathService::Get(chrome::DIR_TEST_DATA, &input);
- file_util::AppendToPath(&input, L"blacklist_small.pbr");
+ input = input.AppendASCII("blacklist_small.pbr");
- FilePath path = FilePath::FromWStringHack(input);
- Blacklist blacklist(path);
+ Blacklist blacklist(input);
// This test is a friend, so inspect the internal structures.
EXPECT_EQ(5U, blacklist.blacklist_.size());