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

Unified Diff: components/test/run_all_unittests.cc

Issue 1999623002: [Autofill] Add typemap for autofill:FormFieldData and autofill::FormData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gyp Created 4 years, 7 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/test/run_all_unittests.cc
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc
index 2a4601d4a72db48432db44c027e02abc2975a901..be7fd81d64ceeb6effd906cf4c1efa2372941b3b 100644
--- a/components/test/run_all_unittests.cc
+++ b/components/test/run_all_unittests.cc
@@ -21,6 +21,7 @@
#if !defined(OS_IOS)
#include "content/public/test/test_content_client_initializer.h"
+#include "mojo/edk/embedder/embedder.h"
#include "ui/gl/test/gl_surface_test_support.h"
#endif
@@ -39,10 +40,6 @@
#include "ui/gfx/android/gfx_jni_registrar.h"
#endif
-#if defined(OS_CHROMEOS)
-#include "mojo/edk/embedder/embedder.h"
-#endif
-
namespace {
class ComponentsTestSuite : public base::TestSuite {
@@ -151,7 +148,7 @@ int main(int argc, char** argv) {
testing::UnitTest::GetInstance()->listeners();
listeners.Append(new ComponentsUnitTestEventListener());
-#if defined(OS_CHROMEOS)
+#if !defined(OS_IOS)
mojo::edk::Init();
#endif

Powered by Google App Engine
This is Rietveld 408576698