Enable more unittests on iOS, and disable those that fail on simulator

webrtc/media/engine/apm_helpers_unittest.cc

Index: webrtc/media/engine/apm_helpers_unittest.cc
diff --git a/webrtc/media/engine/apm_helpers_unittest.cc b/webrtc/media/engine/apm_helpers_unittest.cc
index f7c418d3324286a63dff6418594b32b4d006eb58..6845d9e454bb28df14f4497025b22b86daea7c3c 100644
--- a/webrtc/media/engine/apm_helpers_unittest.cc
+++ b/webrtc/media/engine/apm_helpers_unittest.cc
@@ -110,7 +110,10 @@ TEST(ApmHelpersTest, AgcConfig_GetAndSet) {
 TEST(ApmHelpersTest, AgcStatus_DefaultMode) {
   TestHelper helper;
   GainControl* gc = helper.apm()->gain_control();
-#if defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID)
+#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR

[kthelgason, 2017/06/22 08:16:32]

I don't think there is any reason to check both, just #if
TARGET_IPHONE_SIMULATOR should be enough.

[oprypin_webrtc, 2017/06/22 08:20:46]

This macro is defined only on Mac, and using it directly elsewhere causes a
compilation error. See Patch Set 7 and fix in 8

[oprypin_webrtc, 2017/06/22 08:23:19]

Oh, and patch set 8 is not correct either, checking whether it's defined is
basically equivalent to "are we on Mac?", as it turns out.

+  EXPECT_FALSE(gc->is_enabled());
+  EXPECT_EQ(GainControl::kAdaptiveDigital, gc->mode());
+#elif defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID)
   EXPECT_FALSE(gc->is_enabled());
   EXPECT_EQ(GainControl::kFixedDigital, gc->mode());
 #else
@@ -249,7 +252,14 @@ TEST(ApmHelpersTest, TypingDetectionStatus_DefaultMode) {
   EXPECT_FALSE(vd->is_enabled());
 }
 
-TEST(ApmHelpersTest, TypingDetectionStatus_EnableDisable) {
+// TODO(kthelgason): Reenable this test on simulator.
+// See bugs.webrtc.org/5569
+#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR

[kthelgason, 2017/06/22 08:16:32]

ditto

+#define MAYBE_TypingDetectionStatus_EnableDisable DISABLED_TypingDetectionStatus_EnableDisable
+#else
+#define MAYBE_TypingDetectionStatus_EnableDisable TypingDetectionStatus_EnableDisable
+#endif
+TEST(ApmHelpersTest, MAYBE_TypingDetectionStatus_EnableDisable) {
   TestHelper helper;
   VoiceDetection* vd = helper.apm()->voice_detection();
   apm_helpers::SetTypingDetectionStatus(helper.apm(), true);