Run media_unittests on android test bots.

BUG=137131

TEST=


Review URL: https://chromiumcodereview.appspot.com/10808115

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148493 0039d316-1c4b-4281-b951-d872f2087c98

build/all_android.gyp

@@ -63,10 +63,11 @@
             '../content/content.gyp:content_unittests_apk',
             '../chrome/chrome.gyp:unit_tests_apk',
             '../gpu/gpu.gyp:gpu_unittests_apk',
-            '../sql/sql.gyp:sql_unittests_apk',
-            '../sync/sync.gyp:sync_unit_tests_apk',
             '../ipc/ipc.gyp:ipc_tests_apk',
+            '../media/media.gyp:media_unittests_apk',
             '../net/net.gyp:net_unittests_apk',
+            '../sql/sql.gyp:sql_unittests_apk',
+            '../sync/sync.gyp:sync_unit_tests_apk',
             '../ui/ui.gyp:ui_unittests_apk',
           ],
         }]

build/android/gtest_filter/media_unittests_disabled

+# List of suppressions
+
+# crbug.com/138848
+AudioOutputControllerTest.CreateAndClose
+AudioOutputControllerTest.PlayPauseClose
+AudioOutputControllerTest.PlayPausePlayClose
+
+# crbug.com/136720
+CrossProcessNotificationMultiProcessTest.Basic
+
+# Death tests are not supported on APK
+# http://crbug.com/138855
+CompositeFilterDeathTest.*
+
+# http://crbug.com/138833
+AesDecryptorTest.*

build/android/run_tests.py

@@ -73,6 +73,7 @@ _TEST_SUITES = ['base_unittests',
                 'content_unittests',
                 'gpu_unittests',
                 'ipc_tests',
+                'media_unittests',
                 'net_unittests',
                 'sql_unittests',
                 'sync_unit_tests',

media/base/run_all_unittests.cc

@@ -2,33 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/at_exit.h"
-#include "base/command_line.h"
-#include "base/logging.h"
 #include "base/test/test_suite.h"
 #include "media/base/media.h"
 
 class TestSuiteNoAtExit : public base::TestSuite {
  public:
-  TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv, false) {}
+  TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {}
   virtual ~TestSuiteNoAtExit() {}
+ protected:
+  virtual void Initialize();
 };
 
-int main(int argc, char** argv) {
-  // By default command-line parsing happens only in TestSuite::Run(), but
-  // that's too late to get VLOGs and so on from
-  // InitializeMediaLibraryForTesting() below.  Instead initialize logging
-  // explicitly here (and have it get re-initialized by TestSuite::Run()).
-  CommandLine::Init(argc, argv);
-  CHECK(logging::InitLogging(
-      NULL,
-      logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
-      logging::DONT_LOCK_LOG_FILE,
-      logging::APPEND_TO_OLD_LOG_FILE,
-      logging::ENABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS));
-  base::AtExitManager exit_manager;
-
+void TestSuiteNoAtExit::Initialize() {
+  // Run TestSuite::Initialize first so that logging is initialized.
+  base::TestSuite::Initialize();
+  // Run this here instead of main() to ensure an AtExitManager is already
+  // present.
   media::InitializeMediaLibraryForTesting();
+}
 
+int main(int argc, char** argv) {
   return TestSuiteNoAtExit(argc, argv).Run();
 }