Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21

1 files changed, 55 insertions, 0 deletions

diff --git a/media/base/run_all_perftests.cc b/media/base/run_all_perftests.cc
new file mode 100644
index 0000000000..119bef3303
--- /dev/null
+++ b/media/base/run_all_perftests.cc
@@ -0,0 +1,55 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/bind.h"
+#include "base/command_line.h"
+#include "base/test/launcher/unit_test_launcher.h"
+#include "base/test/test_suite.h"
+#include "build/build_config.h"
+#include "media/base/media.h"
+#include "media/base/media_switches.h"
+
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#include "media/base/android/media_jni_registrar.h"
+#include "ui/gl/android/gl_jni_registrar.h"
+#endif
+
+class TestSuiteNoAtExit : public base::TestSuite {
+ public:
+  TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {}
+  virtual ~TestSuiteNoAtExit() {}
+ protected:
+  virtual void Initialize() OVERRIDE;
+};
+
+void TestSuiteNoAtExit::Initialize() {
+  // Run TestSuite::Initialize first so that logging is initialized.
+  base::TestSuite::Initialize();
+
+#if defined(OS_ANDROID)
+  // Register JNI bindings for android.
+  JNIEnv* env = base::android::AttachCurrentThread();
+  // Needed for surface texture support.
+  ui::gl::android::RegisterJni(env);
+  media::RegisterJni(env);
+#endif
+
+  // Run this here instead of main() to ensure an AtExitManager is already
+  // present.
+  media::InitializeMediaLibraryForTesting();
+  CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  cmd_line->AppendSwitch(switches::kEnableMP3StreamParser);
+}
+
+int main(int argc, char** argv) {
+  TestSuiteNoAtExit test_suite(argc, argv);
+
+  // Always run the perf tests serially, to avoid distorting
+  // perf measurements with randomness resulting from running
+  // in parallel.
+  return base::LaunchUnitTestsSerially(
+      argc, argv, base::Bind(&TestSuiteNoAtExit::Run,
+                             base::Unretained(&test_suite)));
+}