Android: Fix PathUtilsTest.TestGetNativeLibraryDirectory

base/android/path_utils_unittest.cc

 // Copyright (c) 2012 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/android/path_utils.h"
 #include "base/file_path.h"
+#include "base/file_util.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 namespace android {
 
 typedef testing::Test PathUtilsTest;
 
 TEST_F(PathUtilsTest, TestGetDataDirectory) {
   // The string comes from the Java side and depends on the APK
@@ skipping 14 matching lines @@
   EXPECT_STREQ("/data/data/org.chromium.native_test/cache",
                path.value().c_str());
 }
 
 TEST_F(PathUtilsTest, TestGetNativeLibraryDirectory) {
   // The string comes from the Java side and depends on the APK
   // we are running in. Assumes that we are packaged in
   // org.chromium.native_test
   FilePath path;
   GetNativeLibraryDirectory(&path);
-  EXPECT_STREQ("/data/data/org.chromium.native_test/lib",
-               path.value().c_str());
+  // The exact location of the native library will depend on Android
+  // implementation. We just check that there is at least one .so
+  // in the returned directory.
+  file_util::FileEnumerator enumerator(
+      path,
+      false,
+      file_util::FileEnumerator::FILES,
+      "*.so");

[bulach, 2012/11/21 12:04:48]

maybe best to check that it contains at least libbase_unittests.so? if so,
please update the comment above :)

+  EXPECT_FALSE(enumerator.Next().empty());
 }
 
 }  // namespace android
 }  // namespace base