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

Side by Side Diff: content/public/test/content_test_suite_base.cc

Issue 2143903003: [WIP] Move media/capture to device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « content/public/test/DEPS ('k') | content/renderer/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 "content/public/test/content_test_suite_base.h" 5 #include "content/public/test/content_test_suite_base.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 15 matching lines...) Expand all
26 #include "ui/base/ui_base_paths.h" 26 #include "ui/base/ui_base_paths.h"
27 27
28 #if defined(V8_USE_EXTERNAL_STARTUP_DATA) 28 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
29 #include "gin/v8_initializer.h" 29 #include "gin/v8_initializer.h"
30 #endif 30 #endif
31 31
32 #if defined(OS_ANDROID) 32 #if defined(OS_ANDROID)
33 #include "base/android/jni_android.h" 33 #include "base/android/jni_android.h"
34 #include "content/browser/android/browser_jni_registrar.h" 34 #include "content/browser/android/browser_jni_registrar.h"
35 #include "content/common/android/common_jni_registrar.h" 35 #include "content/common/android/common_jni_registrar.h"
36 #include "device/capture/video/android/capture_jni_registrar.h"
36 #include "media/base/android/media_jni_registrar.h" 37 #include "media/base/android/media_jni_registrar.h"
37 #include "media/capture/video/android/capture_jni_registrar.h"
38 #include "net/android/net_jni_registrar.h" 38 #include "net/android/net_jni_registrar.h"
39 #include "ui/android/ui_android_jni_registrar.h" 39 #include "ui/android/ui_android_jni_registrar.h"
40 #include "ui/base/android/ui_base_jni_registrar.h" 40 #include "ui/base/android/ui_base_jni_registrar.h"
41 #include "ui/events/android/events_jni_registrar.h" 41 #include "ui/events/android/events_jni_registrar.h"
42 #include "ui/gfx/android/gfx_jni_registrar.h" 42 #include "ui/gfx/android/gfx_jni_registrar.h"
43 #include "ui/gl/android/gl_jni_registrar.h" 43 #include "ui/gl/android/gl_jni_registrar.h"
44 #endif 44 #endif
45 45
46 #if defined(OS_ANDROID) && !defined(USE_AURA) 46 #if defined(OS_ANDROID) && !defined(USE_AURA)
47 #include "content/public/browser/android/compositor.h" 47 #include "content/public/browser/android/compositor.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 120
121 void ContentTestSuiteBase::RegisterInProcessThreads() { 121 void ContentTestSuiteBase::RegisterInProcessThreads() {
122 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( 122 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory(
123 CreateInProcessUtilityThread); 123 CreateInProcessUtilityThread);
124 RenderProcessHostImpl::RegisterRendererMainThreadFactory( 124 RenderProcessHostImpl::RegisterRendererMainThreadFactory(
125 CreateInProcessRendererThread); 125 CreateInProcessRendererThread);
126 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread); 126 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread);
127 } 127 }
128 128
129 } // namespace content 129 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/DEPS ('k') | content/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698