components/html_viewer/run_all_unittests.cc - Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe.

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: components/html_viewer/run_all_unittests.cc

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: move to mojo::edk namespace in preparation for runtim flag Created 5 years, 3 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 side-by-side diff with in-line comments

Download patch

Index: components/html_viewer/run_all_unittests.cc

diff --git a/components/html_viewer/run_all_unittests.cc b/components/html_viewer/run_all_unittests.cc

index 5ce14d6fef5ea3ed6f424dc44caedba5d2ef3d20..5d8e84d2e606ad4227955e836770e4a7679bdd2a 100644

--- a/components/html_viewer/run_all_unittests.cc

+++ b/components/html_viewer/run_all_unittests.cc

@@ -7,11 +7,16 @@

#include "base/path_service.h"

#include "base/test/launcher/unit_test_launcher.h"

#include "base/test/test_suite.h"

-#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/geometry/size.h"

#include "ui/mojo/init/ui_init.h"

+#if defined(USE_CHROME_EDK)

+#include "mojo/edk/embedder/test_embedder.h"

+#else

+#include "third_party/mojo/src/mojo/edk/embedder/test_embedder.h"

+#endif

#if defined(OS_ANDROID)

#include "base/android/apk_assets.h"

#include "base/android/jni_android.h"

« chrome/browser/BUILD.gn ('K') | « components/html_viewer/DEPS ('k') | components/mus/BUILD.gn » ('j') | mojo/edk/js/test/BUILD.gn » ('J')