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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: content/public/test/content_test_suite_base.cc

diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc

index 9f9be537a9967311815c7cd10744b6c62f30ba6d..9307e536252d7edfd1c6b8e3f0f3eb6f4594ddc8 100644

--- a/content/public/test/content_test_suite_base.cc

+++ b/content/public/test/content_test_suite_base.cc

@@ -10,9 +10,6 @@

#include "base/test/test_suite.h"

#include "base/threading/sequenced_worker_pool.h"

#include "content/browser/browser_thread_impl.h"

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

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

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

#include "content/common/url_schemes.h"

#include "content/gpu/in_process_gpu_thread.h"

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

@@ -21,6 +18,12 @@

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

#include "ui/base/ui_base_paths.h"

+#if !defined(OS_IOS)

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

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

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

+#endif

#if defined(OS_ANDROID)

#include "base/android/jni_android.h"

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

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