debuggng for PR31361

base/test/run_all_base_unittests.cc

Index: base/test/run_all_base_unittests.cc
diff --git a/base/test/run_all_base_unittests.cc b/base/test/run_all_base_unittests.cc
index 30ea8c46f017d6680a810536190facc243684211..827afb607522d24f06de379da9fb5579c12596a1 100644
--- a/base/test/run_all_base_unittests.cc
+++ b/base/test/run_all_base_unittests.cc
@@ -5,21 +5,8 @@
 #include "base/bind.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "build/build_config.h"
-
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#include "base/test/android/test_system_message_handler_link_android.h"
-#endif  // defined(OS_ANDROID)
 
 int main(int argc, char** argv) {
-#if defined(OS_ANDROID)
-  base::android::TestSystemMessageHandlerLink::RegisterJNI(
-      base::android::AttachCurrentThread());
-#endif  // defined(OS_ANDROID)
-
   base::TestSuite test_suite(argc, argv);
-  return base::LaunchUnitTests(
-      argc, argv,
-      base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
+  return test_suite.Run();
 }