Rename MacKeychain to AppleKeychain

crypto/crypto.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # Put all transitive dependencies for Windows HMAC here.
     # This is required so that we can build them for nacl win64.
     'hmac_win64_related_sources': [
@@ skipping 47 matching lines @@
               ['include', 'signature_verifier_nss\.cc$'],
               ['include', 'symmetric_key_nss\.cc$'],
             ],
             'sources!': [
               'hmac_win.cc',
               'openpgp_symmetric_encryption.cc',
               'openpgp_symmetric_encryption.h',
               'symmetric_key_win.cc',
             ],
         }],
+        [ 'OS != "mac" and OS != "ios"', {
+          'sources!': [
+            'apple_keychain.h',
+            'mock_apple_keychain.cc',
+            'mock_apple_keychain.h',
+          ],
+        }],
         [ 'OS == "android"', {
             'dependencies': [
               '../third_party/openssl/openssl.gyp:openssl',
             ],
             'sources/': [
               ['exclude', 'ec_private_key_nss\.cc$'],
               ['exclude', 'ec_signature_creator_nss\.cc$'],
               ['exclude', 'encryptor_nss\.cc$'],
               ['exclude', 'hmac_nss\.cc$'],
               ['exclude', 'signature_verifier_nss\.cc$'],
               ['exclude', 'symmetric_key_nss\.cc$'],
             ],
         }],
         [ 'os_bsd==1', {
           'link_settings': {
             'libraries': [
               '-L/usr/local/lib -lexecinfo',
               ],
             },
           },
         ],
+        [ 'OS == "ios"', {
+          'sources!': [
+            # This class is stubbed out on iOS.
+            'rsa_private_key.cc',
+          ],
+        }],
         [ 'OS == "mac"', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Security.framework',
             ],
           },
         }, {  # OS != "mac"
           'sources!': [
             'cssm_init.cc',
             'cssm_init.h',
@@ skipping 50 matching lines @@
               'openssl_util.cc',
               'openssl_util.h',
               'rsa_private_key_openssl.cc',
               'secure_hash_openssl.cc',
               'signature_creator_openssl.cc',
               'signature_verifier_openssl.cc',
               'symmetric_key_openssl.cc',
             ],
         },],
       ],
-      'target_conditions' : [
-        [ 'OS == "ios"', {
-          'sources!': [
-            # This class is stubbed out on iOS.
-            'rsa_private_key.cc',
-          ],
-        }],
-      ],
       'sources': [
         # NOTE: all transitive dependencies of HMAC on windows need
         #     to be placed in the source list above.
         '<@(hmac_win64_related_sources)',
+        'apple_keychain.h',
+        'apple_keychain_ios.mm',
+        'apple_keychain_mac.mm',
         'capi_util.cc',
         'capi_util.h',
         'crypto_export.h',
         'crypto_module_blocking_password_delegate.h',
         'cssm_init.cc',
         'cssm_init.h',
         'ec_private_key.h',
         'ec_private_key_nss.cc',
         'ec_private_key_openssl.cc',
         'ec_signature_creator.cc',
         'ec_signature_creator.h',
         'ec_signature_creator_impl.h',
         'ec_signature_creator_nss.cc',
         'ec_signature_creator_openssl.cc',
         'encryptor.cc',
         'encryptor.h',
         'encryptor_nss.cc',
         'encryptor_openssl.cc',
         'hmac_nss.cc',
         'hmac_openssl.cc',
-        'keychain_mac.cc',
-        'keychain_mac.h',
         'mac_security_services_lock.cc',
         'mac_security_services_lock.h',
-        'mock_keychain_mac.cc',
-        'mock_keychain_mac.h',
+        'mock_apple_keychain.cc',
+        'mock_apple_keychain.h',
+        'mock_apple_keychain_ios.cc',
+        'mock_apple_keychain_mac.cc',
         'p224_spake.cc',
         'p224_spake.h',
         'nss_util.cc',
         'nss_util.h',
         'nss_util_internal.h',
         'openpgp_symmetric_encryption.cc',
         'openpgp_symmetric_encryption.h',
         'openssl_util.cc',
         'openssl_util.h',
         'p224.cc',
@@ skipping 137 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }