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

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

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/base/stream_parser_buffer.h » ('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"
11 #include "media/base/media_switches.h" 11 #include "media/base/media_switches.h"
12 12
13 #if defined(OS_ANDROID) 13 #if defined(OS_ANDROID)
14 #include "base/android/jni_android.h" 14 #include "base/android/jni_android.h"
15 #include "media/base/android/media_jni_registrar.h" 15 #include "media/base/android/media_jni_registrar.h"
16 #include "ui/gl/android/gl_jni_registrar.h" 16 #include "ui/gl/android/gl_jni_registrar.h"
17 #endif 17 #endif
18 18
19 class TestSuiteNoAtExit : public base::TestSuite { 19 class TestSuiteNoAtExit : public base::TestSuite {
20 public: 20 public:
21 TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {} 21 TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {}
22 virtual ~TestSuiteNoAtExit() {} 22 virtual ~TestSuiteNoAtExit() {}
23 protected: 23 protected:
24 virtual void Initialize() OVERRIDE; 24 virtual void Initialize() override;
25 }; 25 };
26 26
27 void TestSuiteNoAtExit::Initialize() { 27 void TestSuiteNoAtExit::Initialize() {
28 // Run TestSuite::Initialize first so that logging is initialized. 28 // Run TestSuite::Initialize first so that logging is initialized.
29 base::TestSuite::Initialize(); 29 base::TestSuite::Initialize();
30 30
31 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 31 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
32 command_line->AppendSwitch(switches::kEnableInbandTextTracks); 32 command_line->AppendSwitch(switches::kEnableInbandTextTracks);
33 33
34 #if defined(OS_ANDROID) 34 #if defined(OS_ANDROID)
35 // Register JNI bindings for android. 35 // Register JNI bindings for android.
36 JNIEnv* env = base::android::AttachCurrentThread(); 36 JNIEnv* env = base::android::AttachCurrentThread();
37 // Needed for surface texture support. 37 // Needed for surface texture support.
38 ui::gl::android::RegisterJni(env); 38 ui::gl::android::RegisterJni(env);
39 media::RegisterJni(env); 39 media::RegisterJni(env);
40 #endif 40 #endif
41 41
42 // Run this here instead of main() to ensure an AtExitManager is already 42 // Run this here instead of main() to ensure an AtExitManager is already
43 // present. 43 // present.
44 media::InitializeMediaLibraryForTesting(); 44 media::InitializeMediaLibraryForTesting();
45 } 45 }
46 46
47 int main(int argc, char** argv) { 47 int main(int argc, char** argv) {
48 TestSuiteNoAtExit test_suite(argc, argv); 48 TestSuiteNoAtExit test_suite(argc, argv);
49 49
50 return base::LaunchUnitTests( 50 return base::LaunchUnitTests(
51 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, 51 argc, argv, base::Bind(&TestSuiteNoAtExit::Run,
52 base::Unretained(&test_suite))); 52 base::Unretained(&test_suite)));
53 } 53 }
OLDNEW
« no previous file with comments | « media/base/run_all_perftests.cc ('k') | media/base/stream_parser_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698