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

Unified Diff: url/run_all_unittests.cc

Issue 1756193007: Fix iOS GN build after r379128. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « url/BUILD.gn ('k') | url/url.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: url/run_all_unittests.cc
diff --git a/url/run_all_unittests.cc b/url/run_all_unittests.cc
index b3bdcc2dcdef5b0238a5cdcd2b7874de6f1be1b2..82f58a7df0886609223472ff247fbebd14a38f49 100644
--- a/url/run_all_unittests.cc
+++ b/url/run_all_unittests.cc
@@ -8,14 +8,17 @@
#include "base/test/test_io_thread.h"
#include "base/test/test_suite.h"
#include "build/build_config.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/test/scoped_ipc_support.h"
#if defined(OS_ANDROID)
#include "base/android/jni_android.h"
#include "base/test/test_file_util.h"
#endif
+#if !defined(OS_IOS)
+#include "mojo/edk/embedder/embedder.h" // nogncheck
+#include "mojo/edk/test/scoped_ipc_support.h" // nogncheck
+#endif
+
int main(int argc, char** argv) {
#if defined(OS_ANDROID)
JNIEnv* env = base::android::AttachCurrentThread();
@@ -23,11 +26,13 @@ int main(int argc, char** argv) {
#endif
base::TestSuite test_suite(argc, argv);
+#if !defined(OS_IOS)
mojo::edk::Init();
base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
scoped_ptr<mojo::edk::test::ScopedIPCSupport> ipc_support;
ipc_support.reset(
new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner()));
+#endif
return base::LaunchUnitTests(
argc, argv,
« no previous file with comments | « url/BUILD.gn ('k') | url/url.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698