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

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

Issue 1714913002: Reland: Move VideoCapture* files from media/base/android/... to media/capture/video/android/java/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gyp-gn files and added a capture_jni_registrar Created 4 years, 10 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/android/media_jni_registrar.cc ('k') | media/capture/video/android/BUILD.gn » ('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_discardable_memory_allocator.h" 8 #include "base/test/test_discardable_memory_allocator.h"
9 #include "base/test/test_suite.h" 9 #include "base/test/test_suite.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "media/base/fake_media_resources.h" 11 #include "media/base/fake_media_resources.h"
12 #include "media/base/media.h" 12 #include "media/base/media.h"
13 #include "media/base/media_switches.h" 13 #include "media/base/media_switches.h"
14 14
15 #if defined(OS_ANDROID) 15 #if defined(OS_ANDROID)
16 #include "base/android/jni_android.h" 16 #include "base/android/jni_android.h"
17 #include "media/base/android/media_jni_registrar.h" 17 #include "media/base/android/media_jni_registrar.h"
18 #include "media/capture/video/android/capture_jni_registrar.h"
18 #include "ui/gl/android/gl_jni_registrar.h" 19 #include "ui/gl/android/gl_jni_registrar.h"
19 #endif 20 #endif
20 21
21 class TestSuiteNoAtExit : public base::TestSuite { 22 class TestSuiteNoAtExit : public base::TestSuite {
22 public: 23 public:
23 TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {} 24 TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {}
24 ~TestSuiteNoAtExit() override {} 25 ~TestSuiteNoAtExit() override {}
25 26
26 protected: 27 protected:
27 void Initialize() override; 28 void Initialize() override;
28 29
29 private: 30 private:
30 base::TestDiscardableMemoryAllocator discardable_memory_allocator_; 31 base::TestDiscardableMemoryAllocator discardable_memory_allocator_;
31 }; 32 };
32 33
33 void TestSuiteNoAtExit::Initialize() { 34 void TestSuiteNoAtExit::Initialize() {
34 // Run TestSuite::Initialize first so that logging is initialized. 35 // Run TestSuite::Initialize first so that logging is initialized.
35 base::TestSuite::Initialize(); 36 base::TestSuite::Initialize();
36 37
37 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 38 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
38 command_line->AppendSwitch(switches::kEnableInbandTextTracks); 39 command_line->AppendSwitch(switches::kEnableInbandTextTracks);
39 40
40 #if defined(OS_ANDROID) 41 #if defined(OS_ANDROID)
41 // Register JNI bindings for android. 42 // Register JNI bindings for android.
42 JNIEnv* env = base::android::AttachCurrentThread(); 43 JNIEnv* env = base::android::AttachCurrentThread();
43 // Needed for surface texture support. 44 // Needed for surface texture support.
44 ui::gl::android::RegisterJni(env); 45 ui::gl::android::RegisterJni(env);
45 media::RegisterJni(env); 46 media::RegisterJni(env);
47 media::RegisterCaptureJni(env);
46 #endif 48 #endif
47 49
48 // Run this here instead of main() to ensure an AtExitManager is already 50 // Run this here instead of main() to ensure an AtExitManager is already
49 // present. 51 // present.
50 media::InitializeMediaLibrary(); 52 media::InitializeMediaLibrary();
51 media::SetUpFakeMediaResources(); 53 media::SetUpFakeMediaResources();
52 54
53 base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_); 55 base::DiscardableMemoryAllocator::SetInstance(&discardable_memory_allocator_);
54 } 56 }
55 57
56 int main(int argc, char** argv) { 58 int main(int argc, char** argv) {
57 TestSuiteNoAtExit test_suite(argc, argv); 59 TestSuiteNoAtExit test_suite(argc, argv);
58 60
59 return base::LaunchUnitTests( 61 return base::LaunchUnitTests(
60 argc, argv, base::Bind(&TestSuiteNoAtExit::Run, 62 argc, argv, base::Bind(&TestSuiteNoAtExit::Run,
61 base::Unretained(&test_suite))); 63 base::Unretained(&test_suite)));
62 } 64 }
OLDNEW
« no previous file with comments | « media/base/android/media_jni_registrar.cc ('k') | media/capture/video/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698