Upstream misc changes for android.

base/path_service_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/path_service.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/file_path.h"
 #if defined(OS_WIN)
@@ skipping 32 matching lines @@
 
 // On the Mac this winds up using some autoreleased objects, so we need to
 // be a PlatformTest.
 typedef PlatformTest PathServiceTest;
 
 // Test that all PathService::Get calls return a value and a true result
 // in the development environment.  (This test was created because a few
 // 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) {

[brettw, 2011/08/24 20:46:58]

Why doesn't this code work on Android? It seems like this existing loop handles
all of your above cases.

[michaelbai, 2011/08/24 23:02:18]

The FILE_MODULE is not implemented in Android.

[brettw, 2011/08/24 23:17:13]

It seems like the correct solution then is to implement the FILE_MODULE getter.

[michaelbai, 2011/08/25 17:26:16]

I could implement the FILE_MODULE, but the issue is that we used the different
directory in test. We set the DIR_MODULE to /data/local/tmp directory in test,
but I can't set FILE_MODULE to a file in /data/local/tmp which could be empty.

Another way, I could set FILE_MODULE to a file which doesn't locate in
DIR_MODULE. Do we have assumption that FILE_MODULE is in DIR_MODULE directory?

[brettw, 2011/08/25 17:49:10]

I guess we can leave FILE_MODULE unimplemented. In that case, I think it would
be better to explicitly filter that one out in the loop:
  #if defined(OS_ANDROID)
    if (key == base::FILE_MODULE)
      continue;  // Android doesn't implement FILE_MODULE;
  #endif

[michaelbai, 2011/08/25 18:09:52]

Done.

     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 &&
         base::win::GetVersion() < base::win::VERSION_VISTA) {
       // DIR_LOCAL_APP_DATA_LOW is not supported prior Vista and is expected to
       // fail.
       EXPECT_TRUE(ReturnsInvalidPath(key)) << key;
     } else {
       EXPECT_TRUE(ReturnsValidPath(key)) << key;
     }
   }
 #elif defined(OS_MACOSX)
   for (int key = base::PATH_MAC_START + 1; key < base::PATH_MAC_END; ++key) {
       EXPECT_PRED1(ReturnsValidPath, key);
   }
 #endif
 }