Fix to use FilePath in more unittests.
Landing patch for Thiago Farina, original review: http://codereview.chromium.org/187005
BUG=None
TEST=run unit_tests.exe, base_unittests.exe.
Review URL: http://codereview.chromium.org/193101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26142 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: b65de8b9d5bfa020d97122c1eff2115fa8e97561
diff --git a/base/path_service_unittest.cc b/base/path_service_unittest.cc
index d9eb0a5..32f49b2 100644
--- a/base/path_service_unittest.cc
+++ b/base/path_service_unittest.cc
@@ -27,7 +27,7 @@
#if defined(OS_WIN)
// Function to test DIR_LOCAL_APP_DATA_LOW on Windows XP. Make sure it fails.
bool ReturnsInvalidPath(int dir_type) {
- std::wstring path;
+ FilePath path;
bool result = PathService::Get(base::DIR_LOCAL_APP_DATA_LOW, &path);
return !result && path.empty();
}
diff --git a/base/sys_info_unittest.cc b/base/sys_info_unittest.cc
index 8c5391f..160abd6 100644
--- a/base/sys_info_unittest.cc
+++ b/base/sys_info_unittest.cc
@@ -22,9 +22,10 @@
TEST_F(SysInfoTest, AmountOfFreeDiskSpace) {
// We aren't actually testing that it's correct, just that it's sane.
- std::wstring tmp_path;
+ FilePath tmp_path;
ASSERT_TRUE(file_util::GetTempDir(&tmp_path));
- EXPECT_GT(base::SysInfo::AmountOfFreeDiskSpace(tmp_path), 0) << tmp_path;
+ EXPECT_GT(base::SysInfo::AmountOfFreeDiskSpace(tmp_path.ToWStringHack()), 0)
+ << tmp_path.value();
}
TEST_F(SysInfoTest, GetEnvVar) {