Index: base/path_service_unittest.cc |
diff --git a/base/path_service_unittest.cc b/base/path_service_unittest.cc |
index 81d1fef0b96c61379712f4c9ee2a87e720b2a37a..f0969ebf0915b0a370960a049052e54db0a1b3b7 100644 |
--- a/base/path_service_unittest.cc |
+++ b/base/path_service_unittest.cc |
@@ -26,9 +26,9 @@ bool ReturnsValidPath(int dir_type) { |
// If chromium has never been started on this account, the cache path may not |
// exist. |
if (dir_type == base::DIR_CACHE) |
- return result && !path.value().empty(); |
+ return result && !path.empty(); |
#endif |
- return result && !path.value().empty() && file_util::PathExists(path); |
+ return result && !path.empty() && file_util::PathExists(path); |
} |
#if defined(OS_WIN) |
@@ -53,10 +53,10 @@ typedef PlatformTest PathServiceTest; |
// later changes to Get broke the semantics of the function and yielded the |
// correct value while returning false.) |
TEST_F(PathServiceTest, Get) { |
- for (int key = base::DIR_CURRENT; key < base::PATH_END; ++key) { |
+ for (int key = base::PATH_START + 1; key < base::PATH_END; ++key) { |
#if defined(OS_ANDROID) |
- if (key == base::FILE_MODULE) |
- continue; // Android doesn't implement FILE_MODULE; |
+ if (key == base::FILE_MODULE || key == base::DIR_USER_DESKTOP) |
+ continue; // Android doesn't implement FILE_MODULE and DIR_USER_DESKTOP; |
#endif |
EXPECT_PRED1(ReturnsValidPath, key); |
} |
@@ -83,7 +83,17 @@ TEST_F(PathServiceTest, Get) { |
} |
#elif defined(OS_MACOSX) |
for (int key = base::PATH_MAC_START + 1; key < base::PATH_MAC_END; ++key) { |
- EXPECT_PRED1(ReturnsValidPath, key); |
+ EXPECT_PRED1(ReturnsValidPath, key); |
+ } |
+#elif defined(OS_ANDROID) |
+ for (int key = base::PATH_ANDROID_START + 1; key < base::PATH_ANDROID_END; |
+ ++key) { |
+ EXPECT_PRED1(ReturnsValidPath, key); |
+ } |
+#elif defined(OS_POSIX) |
+ for (int key = base::PATH_POSIX_START + 1; key < base::PATH_POSIX_END; |
+ ++key) { |
+ EXPECT_PRED1(ReturnsValidPath, key); |
} |
#endif |
} |