Revert of move all reference to carbon api

webrtc/base/base.gyp

Index: webrtc/base/base.gyp
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 9baecd6802c0906614f9bdff70bf2612c5f7f2a4..93f87b2957760cb3d5f2417c3955bd76a87b3a40 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -229,7 +229,6 @@
         'LOGGING=1',
       ],
       'sources': [
-        'applefilesystem.mm',
         'arraysize.h',
         'asyncfile.cc',
         'asyncfile.h',
@@ -278,6 +277,7 @@
         'httpcommon.h',
         'httprequest.cc',
         'httprequest.h',
+        'iosfilesystem.mm',
         'ipaddress.cc',
         'ipaddress.h',
         'linked_ptr.h',
@@ -603,6 +603,19 @@
               },
             },
           },
+          'conditions': [
+            ['target_arch=="ia32"', {
+              'all_dependent_settings': {
+                'link_settings': {
+                  'xcode_settings': {
+                    'OTHER_LDFLAGS': [
+                      '-framework Carbon',
+                    ],
+                  },
+                },
+              },
+            }],
+          ],
         }],
         ['OS=="win" and nacl_untrusted_build==0', {
           'sources': [
@@ -651,6 +664,11 @@
             },
           }
         }],
+        ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
+          'defines': [
+            'CARBON_DEPRECATED=YES',
+          ],
+        }],
         ['OS=="linux" or OS=="android"', {
           'sources': [
             'linux.cc',