Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Side by Side Diff: media/base/run_all_unittests.cc

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Roll DEPS to fix cros, rebase. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/base/run_all_perftests.cc ('k') | media/blink/run_all_unittests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/test/launcher/unit_test_launcher.h" 7 #include "base/test/launcher/unit_test_launcher.h"
8 #include "base/test/test_suite.h" 8 #include "base/test/test_suite.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "media/base/media.h" 10 #include "media/base/media.h"
(...skipping 24 matching lines...) Expand all
35 #if defined(OS_ANDROID) 35 #if defined(OS_ANDROID)
36 // Register JNI bindings for android. 36 // Register JNI bindings for android.
37 JNIEnv* env = base::android::AttachCurrentThread(); 37 JNIEnv* env = base::android::AttachCurrentThread();
38 // Needed for surface texture support. 38 // Needed for surface texture support.
39 ui::gl::android::RegisterJni(env); 39 ui::gl::android::RegisterJni(env);
40 media::RegisterJni(env); 40 media::RegisterJni(env);
41 #endif 41 #endif
42 42
43 // Run this here instead of main() to ensure an AtExitManager is already 43 // Run this here instead of main() to ensure an AtExitManager is already
44 // present. 44 // present.
45 media::InitializeMediaLibraryForTesting(); 45 media::InitializeMediaLibrary();
46 } 46 }
47 47
48 int main(int argc, char** argv) { 48 int main(int argc, char** argv) {
49 TestSuiteNoAtExit test_suite(argc, argv); 49 TestSuiteNoAtExit test_suite(argc, argv);
50 50
51 return base::LaunchUnitTests( 51 return base::LaunchUnitTests(
52 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, 52 argc, argv, base::Bind(&TestSuiteNoAtExit::Run,
53 base::Unretained(&test_suite))); 53 base::Unretained(&test_suite)));
54 } 54 }
OLDNEW
« no previous file with comments | « media/base/run_all_perftests.cc ('k') | media/blink/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698