Index: components/test/run_all_unittests.cc |
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc |
index 9edbe9c2e461a0f72e4debc2e237dc367ff70e7d..e9e32c6132ffe7185e7b0642e1a1b0c82564fa1a 100644 |
--- a/components/test/run_all_unittests.cc |
+++ b/components/test/run_all_unittests.cc |
@@ -10,13 +10,13 @@ |
#include "base/test/launcher/unit_test_launcher.h" |
#include "base/test/test_suite.h" |
#include "components/content_settings/core/common/content_settings_pattern.h" |
-#include "content/public/test/test_content_client_initializer.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/base/ui_base_paths.h" |
#include "url/url_util.h" |
#if !defined(OS_IOS) |
+#include "content/public/test/test_content_client_initializer.h" |
#include "ui/gl/test/gl_surface_test_support.h" |
#endif |
@@ -97,6 +97,7 @@ class ComponentsTestSuite : public base::TestSuite { |
DISALLOW_COPY_AND_ASSIGN(ComponentsTestSuite); |
}; |
+#if !defined(OS_IOS) |
class ComponentsUnitTestEventListener : public testing::EmptyTestEventListener { |
public: |
ComponentsUnitTestEventListener() {} |
@@ -115,17 +116,20 @@ class ComponentsUnitTestEventListener : public testing::EmptyTestEventListener { |
DISALLOW_COPY_AND_ASSIGN(ComponentsUnitTestEventListener); |
}; |
+#endif // !defined(OS_IOS) |
} // namespace |
int main(int argc, char** argv) { |
ComponentsTestSuite test_suite(argc, argv); |
+#if !defined(OS_IOS) |
// The listener will set up common test environment for all components unit |
// tests. |
testing::TestEventListeners& listeners = |
testing::UnitTest::GetInstance()->listeners(); |
listeners.Append(new ComponentsUnitTestEventListener()); |
+#endif // !defined(OS_IOS) |
return base::LaunchUnitTests( |
argc, argv, base::Bind(&base::TestSuite::Run, |