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

Side by Side Diff: chromecast/media/cma/test/run_all_unittests.cc

Issue 1161183003: Revert "Chromium changes to statically link ffmpeg." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/test/launcher/unit_test_launcher.h" 6 #include "base/test/launcher/unit_test_launcher.h"
7 #include "base/test/test_suite.h" 7 #include "base/test/test_suite.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chromecast/base/metrics/cast_metrics_test_helper.h" 9 #include "chromecast/base/metrics/cast_metrics_test_helper.h"
10 #include "media/base/media.h" 10 #include "media/base/media.h"
(...skipping 15 matching lines...) Expand all
26 void CmaTestSuite::Initialize() { 26 void CmaTestSuite::Initialize() {
27 // Run TestSuite::Initialize first so that logging is initialized. 27 // Run TestSuite::Initialize first so that logging is initialized.
28 base::TestSuite::Initialize(); 28 base::TestSuite::Initialize();
29 29
30 // Some of the chromecast media unit tests require a metrics helper instance. 30 // Some of the chromecast media unit tests require a metrics helper instance.
31 // Provide a fake one. 31 // Provide a fake one.
32 chromecast::metrics::InitializeMetricsHelperForTesting(); 32 chromecast::metrics::InitializeMetricsHelperForTesting();
33 33
34 // Initialize the FFMpeg library. 34 // Initialize the FFMpeg library.
35 // Note: at this time, AtExitManager is already present. 35 // Note: at this time, AtExitManager is already present.
36 media::InitializeMediaLibrary(); 36 media::InitializeMediaLibraryForTesting();
37 } 37 }
38 38
39 int main(int argc, char** argv) { 39 int main(int argc, char** argv) {
40 CmaTestSuite test_suite(argc, argv); 40 CmaTestSuite test_suite(argc, argv);
41 41
42 return base::LaunchUnitTests( 42 return base::LaunchUnitTests(
43 argc, argv, base::Bind(&CmaTestSuite::Run, 43 argc, argv, base::Bind(&CmaTestSuite::Run,
44 base::Unretained(&test_suite))); 44 base::Unretained(&test_suite)));
45 } 45 }
OLDNEW
« no previous file with comments | « chrome/utility/extensions/extensions_handler.cc ('k') | components/components_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698