Upstream misc changes for android.

base/path_service_unittest.cc

Index: base/path_service_unittest.cc
diff --git a/base/path_service_unittest.cc b/base/path_service_unittest.cc
index 26998de5c097ceaccf95e83f0cac54056c0a0255..344dbe6c9944a22144e131f48047a2365e48fc4e 100644
--- a/base/path_service_unittest.cc
+++ b/base/path_service_unittest.cc
@@ -50,9 +50,16 @@ 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) {
+#if defined(OS_ANDROID)
+  EXPECT_PRED1(ReturnsValidPath, static_cast<int>(base::FILE_EXE));
+  EXPECT_PRED1(ReturnsValidPath, static_cast<int>(base::DIR_MODULE));
+  EXPECT_PRED1(ReturnsValidPath, static_cast<int>(base::DIR_SOURCE_ROOT));
+  EXPECT_PRED1(ReturnsValidPath, static_cast<int>(base::DIR_CACHE));
+#else
   for (int key = base::DIR_CURRENT; key < base::PATH_END; ++key) {
     EXPECT_PRED1(ReturnsValidPath, key);
   }
+#endif
 #if defined(OS_WIN)
   for (int key = base::PATH_WIN_START + 1; key < base::PATH_WIN_END; ++key) {
     if (key == base::DIR_LOCAL_APP_DATA_LOW &&