Reland of move all reference to carbon api

webrtc/BUILD.gn

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330.
 
@@ skipping 541 matching lines @@
       sources += [ "base/macutils_unittest.cc" ]
     }
 
     if (is_posix) {
       sources += [
         "base/ssladapter_unittest.cc",
         "base/sslidentity_unittest.cc",
         "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",
         "p2p/quic/quicsession_unittest.cc",
         "p2p/quic/quictransport_unittest.cc",
         "p2p/quic/quictransportchannel_unittest.cc",
         "p2p/quic/reliablequicstream_unittest.cc",
       ]
     }
 
@@ skipping 242 matching lines @@
       sources += [ "base/win32socketserver_unittest.cc" ]
     }
     if (is_android) {
       deps += [ "//testing/android/native_test:native_test_support" ]
       shard_timeout = 900
     }
 
     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.
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
   }
 }