Index: media/base/run_all_unittests.cc |
diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc |
index 4dc422450c8634f3fd164e28bd3dcb172c81d2d4..d4d92b6111a8f27dd1d7c68c6501cee618828f81 100644 |
--- a/media/base/run_all_unittests.cc |
+++ b/media/base/run_all_unittests.cc |
@@ -26,7 +26,13 @@ int main(int argc, char** argv) { |
logging::DONT_LOCK_LOG_FILE, |
logging::APPEND_TO_OLD_LOG_FILE, |
logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS)); |
+ |
+ // On Android, AtExitManager is created in |
+ // testing/android/native_test_wrapper.cc before main() is called. |
Ami GONE FROM CHROMIUM
2012/07/24 23:37:35
Do you mean native_test_launcher.cc?
Is this patt
nilesh
2012/07/25 00:19:45
Yes. Corrected.
nilesh
2012/07/25 00:23:11
I can look into having multiple AtExitManager not
Ami GONE FROM CHROMIUM
2012/07/25 17:09:59
Can you make the pre-main() code not need an AEM?
nilesh
2012/07/25 21:56:32
I take back my comment that we need similar code i
|
+ // The same thing is also done in base/test/test_suite.cc |
Ami GONE FROM CHROMIUM
2012/07/24 23:37:35
This line isn't useful to commit IMO.
nilesh
2012/07/25 00:19:45
Removed.
|
+#if !defined(OS_ANDROID) |
base::AtExitManager exit_manager; |
+#endif |
media::InitializeMediaLibraryForTesting(); |