Test disabling timing reports

Change-Id: I5b904bbf9e039b2a15f8328b156fcc7bdd1d71ca
diff --git a/aos/events/shm_event_loop_test.cc b/aos/events/shm_event_loop_test.cc
index 8e7ad93..cd91ab3 100644
--- a/aos/events/shm_event_loop_test.cc
+++ b/aos/events/shm_event_loop_test.cc
@@ -70,25 +70,18 @@
   ::aos::ShmEventLoop *primary_event_loop_;
 };
 
-INSTANTIATE_TEST_CASE_P(ShmEventLoopCopyTest, AbstractEventLoopTest,
-                        ::testing::Values(std::make_pair(
-                            []() { return new ShmEventLoopTestFactory(); },
-                            ReadMethod::COPY)));
+auto CommonParameters() {
+  return ::testing::Combine(
+      ::testing::Values([]() { return new ShmEventLoopTestFactory(); }),
+      ::testing::Values(ReadMethod::COPY, ReadMethod::PIN),
+      ::testing::Values(DoTimingReports::kYes, DoTimingReports::kNo));
+}
 
-INSTANTIATE_TEST_CASE_P(ShmEventLoopCopyDeathTest, AbstractEventLoopDeathTest,
-                        ::testing::Values(std::make_pair(
-                            []() { return new ShmEventLoopTestFactory(); },
-                            ReadMethod::COPY)));
+INSTANTIATE_TEST_CASE_P(ShmEventLoopCommonTest, AbstractEventLoopTest,
+                        CommonParameters());
 
-INSTANTIATE_TEST_CASE_P(ShmEventLoopPinTest, AbstractEventLoopTest,
-                        ::testing::Values(std::make_pair(
-                            []() { return new ShmEventLoopTestFactory(); },
-                            ReadMethod::PIN)));
-
-INSTANTIATE_TEST_CASE_P(ShmEventLoopPinDeathTest, AbstractEventLoopDeathTest,
-                        ::testing::Values(std::make_pair(
-                            []() { return new ShmEventLoopTestFactory(); },
-                            ReadMethod::PIN)));
+INSTANTIATE_TEST_CASE_P(ShmEventLoopCommonDeathTest, AbstractEventLoopDeathTest,
+                        CommonParameters());
 
 }  // namespace