Index: base/test/run_all_unittests.cc |
diff --git a/base/test/run_all_unittests.cc b/base/test/run_all_unittests.cc |
index e561f0e627b7d62face788a0e41d612d0d5cdc3d..3b5ebfe5a9b370f0f25bc0d8d796f51094a90e11 100644 |
--- a/base/test/run_all_unittests.cc |
+++ b/base/test/run_all_unittests.cc |
@@ -7,6 +7,11 @@ |
#include "base/test/launcher/unit_test_launcher.h" |
#include "base/test/test_suite.h" |
+#if defined(OS_ANDROID) |
+#include "base/android/jni_android.h" |
+#include "base/test/test_file_util.h" |
+#endif |
+ |
namespace { |
class NoAtExitBaseTestSuite : public base::TestSuite { |
@@ -23,7 +28,10 @@ int RunTestSuite(int argc, char** argv) { |
} // namespace |
int main(int argc, char** argv) { |
-#if !defined(OS_ANDROID) |
+#if defined(OS_ANDROID) |
+ JNIEnv* env = base::android::AttachCurrentThread(); |
+ file_util::RegisterContentUriTestUtils(env); |
+#else |
base::AtExitManager at_exit; |
#endif |
return base::LaunchUnitTests(argc, |