Reland of move all reference to carbon api

webrtc/BUILD.gn

Index: webrtc/BUILD.gn
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index f42cc24646e72e114050df37ec2fa23d632f44ec..a4b07594b8f2f4175b49e2846940bda8f99ec0b0 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -562,10 +562,6 @@ if (rtc_include_tests) {
         "base/sslstreamadapter_unittest.cc",
       ]
     }
-    if (is_ios || (is_mac && target_cpu != "x86")) {
-      defines = [ "CARBON_DEPRECATED=YES" ]
-    }
-
     if (rtc_use_quic) {
       sources += [
         "p2p/quic/quicconnectionhelper_unittest.cc",
@@ -828,9 +824,6 @@ if (rtc_include_tests) {
     if (is_mac) {
       sources += [ "base/macsocketserver_unittest.cc" ]
     }
-    if (is_ios || (is_mac && target_cpu != "x86")) {
-      defines = [ "CARBON_DEPRECATED=YES" ]
-    }
     if (is_clang) {
       # Suppress warnings from the Chromium Clang plugin.
       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.