content/public/test/content_test_suite_base.cc - Issue 256403004: Move Mojo channel initialization closer to IPC::Channel setup

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

Issue 256403004: Move Mojo channel initialization closer to IPC::Channel setup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: another ios fix Created 6 years, 8 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 | Annotate | Revision Log

« no previous file with comments | « content/content_worker.gypi ('k') | content/renderer/mojo/mojo_render_process_observer.h » ('j') | no next file with comments »

OLD	NEW
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 "base/basictypes.h"	7 #include "base/basictypes.h"

8 #include "base/compiler_specific.h"	8 #include "base/compiler_specific.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "base/test/test_suite.h"	10 #include "base/test/test_suite.h"

11 #include "base/threading/sequenced_worker_pool.h"	11 #include "base/threading/sequenced_worker_pool.h"

12 #include "content/browser/browser_thread_impl.h"	12 #include "content/browser/browser_thread_impl.h"

13 #include "content/browser/gpu/gpu_process_host.h"

14 #include "content/browser/renderer_host/render_process_host_impl.h"

15 #include "content/browser/utility_process_host_impl.h"

16 #include "content/common/url_schemes.h"	13 #include "content/common/url_schemes.h"

17 #include "content/gpu/in_process_gpu_thread.h"	14 #include "content/gpu/in_process_gpu_thread.h"

18 #include "content/public/common/content_client.h"	15 #include "content/public/common/content_client.h"

19 #include "content/renderer/in_process_renderer_thread.h"	16 #include "content/renderer/in_process_renderer_thread.h"

20 #include "content/utility/in_process_utility_thread.h"	17 #include "content/utility/in_process_utility_thread.h"

21 #include "testing/gtest/include/gtest/gtest.h"	18 #include "testing/gtest/include/gtest/gtest.h"

22 #include "ui/base/ui_base_paths.h"	19 #include "ui/base/ui_base_paths.h"

23	20

	21 #if !defined(OS_IOS)

	22 #include "content/browser/gpu/gpu_process_host.h"

	23 #include "content/browser/renderer_host/render_process_host_impl.h"

	24 #include "content/browser/utility_process_host_impl.h"

	25 #endif

	26

24 #if defined(OS_ANDROID)	27 #if defined(OS_ANDROID)

25 #include "base/android/jni_android.h"	28 #include "base/android/jni_android.h"

26 #include "content/browser/android/browser_jni_registrar.h"	29 #include "content/browser/android/browser_jni_registrar.h"

27 #include "content/common/android/common_jni_registrar.h"	30 #include "content/common/android/common_jni_registrar.h"

28 #include "media/base/android/media_jni_registrar.h"	31 #include "media/base/android/media_jni_registrar.h"

29 #include "net/android/net_jni_registrar.h"	32 #include "net/android/net_jni_registrar.h"

30 #include "ui/base/android/ui_base_jni_registrar.h"	33 #include "ui/base/android/ui_base_jni_registrar.h"

31 #include "ui/gfx/android/gfx_jni_registrar.h"	34 #include "ui/gfx/android/gfx_jni_registrar.h"

32 #include "ui/gl/android/gl_jni_registrar.h"	35 #include "ui/gl/android/gl_jni_registrar.h"

33 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"	36 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
80 #if !defined(OS_IOS)	83 #if !defined(OS_IOS)

81 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory(	84 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory(

82 CreateInProcessUtilityThread);	85 CreateInProcessUtilityThread);

83 RenderProcessHostImpl::RegisterRendererMainThreadFactory(	86 RenderProcessHostImpl::RegisterRendererMainThreadFactory(

84 CreateInProcessRendererThread);	87 CreateInProcessRendererThread);

85 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread);	88 GpuProcessHost::RegisterGpuMainThreadFactory(CreateInProcessGpuThread);

86 #endif	89 #endif

87 }	90 }

88	91

89 } // namespace content	92 } // namespace content

OLD	NEW