| Index: trunk/src/base/test/run_all_unittests.cc
|
| ===================================================================
|
| --- trunk/src/base/test/run_all_unittests.cc (revision 235758)
|
| +++ trunk/src/base/test/run_all_unittests.cc (working copy)
|
| @@ -7,11 +7,6 @@
|
| #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 {
|
| @@ -28,10 +23,7 @@
|
| } // namespace
|
|
|
| int main(int argc, char** argv) {
|
| -#if defined(OS_ANDROID)
|
| - JNIEnv* env = base::android::AttachCurrentThread();
|
| - file_util::RegisterContentUriTestUtils(env);
|
| -#else
|
| +#if !defined(OS_ANDROID)
|
| base::AtExitManager at_exit;
|
| #endif
|
| return base::LaunchUnitTests(argc,
|
|
|