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

Unified Diff: components/test/run_all_unittests.cc

Issue 1310513006: Adding components to dependencies on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/test/run_all_unittests.cc
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc
index d04085ea80db4c8c89031f3b98e67826684f67d7..bfdb9cc96557056e07072a13b258b710d08c5fd9 100644
--- a/components/test/run_all_unittests.cc
+++ b/components/test/run_all_unittests.cc
@@ -97,6 +97,7 @@ class ComponentsTestSuite : public base::TestSuite {
DISALLOW_COPY_AND_ASSIGN(ComponentsTestSuite);
};
+#if !defined(OS_IOS)
Dirk Pranke 2015/09/09 20:37:28 why do we need this change if we don't need it in
sdefresne 2015/09/10 08:45:49 This was how it was done in the version of patchse
class ComponentsUnitTestEventListener : public testing::EmptyTestEventListener {
public:
ComponentsUnitTestEventListener() {}
@@ -121,17 +122,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,

Powered by Google App Engine
This is Rietveld 408576698