Reland of move all reference to carbon api

webrtc/webrtc_tests.gypi

Index: webrtc/webrtc_tests.gypi
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index f93b5c0a84f888ddaa86a31d3e17957ab278b189..47a6833a4ac97a9aa89a83ddb926e915406eb1b1 100644
--- a/webrtc/webrtc_tests.gypi
+++ b/webrtc/webrtc_tests.gypi
@@ -165,11 +165,6 @@
             'base/sslstreamadapter_unittest.cc',
           ],
         }],
-        ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
-          'defines': [
-            'CARBON_DEPRECATED=YES',
-          ],
-        }],
         ['use_quic==1', {
           'sources': [
             'p2p/quic/quicconnectionhelper_unittest.cc',
@@ -503,11 +498,6 @@
             'base/macsocketserver_unittest.cc',
           ],
         }],
-        ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
-          'defines': [
-            'CARBON_DEPRECATED=YES',
-          ],
-        }],
       ],
     },
   ],