| Index: dbus/run_all_unittests.cc
|
| diff --git a/ipc/run_all_unittests.cc b/dbus/run_all_unittests.cc
|
| similarity index 77%
|
| copy from ipc/run_all_unittests.cc
|
| copy to dbus/run_all_unittests.cc
|
| index d36f8712210d24f4ed51f9d883d182dc473c897f..e90849c1c2fac5937ab877fcef7b3bfca39ad9e5 100644
|
| --- a/ipc/run_all_unittests.cc
|
| +++ b/dbus/run_all_unittests.cc
|
| @@ -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,12 +23,7 @@ int RunTestSuite(int argc, char** argv) {
|
| } // namespace
|
|
|
| int main(int argc, char** argv) {
|
| -#if defined(OS_ANDROID)
|
| - JNIEnv* env = base::android::AttachCurrentThread();
|
| - file_util::RegisterContentUriTestUtils(env);
|
| -#else
|
| base::AtExitManager at_exit;
|
| -#endif
|
| return base::LaunchUnitTestsSerially(argc,
|
| argv,
|
| base::Bind(&RunTestSuite, argc, argv));
|
|
|