Remove a NOTREACHED() that was causing a dialog box during unit tests, hence
making it timeout on the test bot. Also simplify the test code.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@546 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/base/path_service_unittest.cc b/base/path_service_unittest.cc
index 2835d37..b75ab7e6 100644
--- a/base/path_service_unittest.cc
+++ b/base/path_service_unittest.cc
@@ -46,10 +46,10 @@
}
// Function to test DIR_LOCAL_APP_DATA_LOW on Windows XP. Make sure it fails.
-void GetPath() {
+bool ReturnsInvalidPath(int dir_type) {
std::wstring path;
bool result = PathService::Get(base::DIR_LOCAL_APP_DATA_LOW, &path);
- EXPECT_FALSE(result);
+ return !result && path.empty();
}
} // namespace
@@ -68,15 +68,9 @@
win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
// DIR_LOCAL_APP_DATA_LOW is not supported prior Vista and is expected to
// fail.
-#ifdef _DEBUG
- EXPECT_FATAL_FAILURE(GetPath(), ":FATAL:base_paths_win.cc(");
-#else
- // In release, the DCHECK won't be hit. Still verify that
- // PathService::Get() returns false.
- GetPath();
-#endif
+ EXPECT_TRUE(ReturnsInvalidPath(key)) << key;
} else {
- EXPECT_PRED1(ReturnsValidPath, key);
+ EXPECT_TRUE(ReturnsValidPath(key)) << key;
}
}
#endif
