src/crypto should build on the x86_64 architecture.

crypto/mock_keychain_mac.h

 // 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.
 
 #ifndef CRYPTO_MOCK_KEYCHAIN_MAC_H_
 #define CRYPTO_MOCK_KEYCHAIN_MAC_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 152 matching lines @@
   // set.
   void SetTestDataPort(int item, UInt32 value);
   void SetTestDataProtocol(int item, SecProtocolType value);
   void SetTestDataAuthType(int item, SecAuthenticationType value);
   void SetTestDataNegativeItem(int item, Boolean value);
   void SetTestDataCreator(int item, OSType value);
   // Sets the password data and length for the item-th test item.
   void SetTestDataPasswordBytes(int item, const void* data, size_t length);
   // Sets the password for the item-th test item. As with SetTestDataString,
   // the data will not be null-terminated.
   void SetTestDataPasswordString(int item, const char* value);

[wtc, 2012/07/11 21:15:28]

All of these "int item" arguments probably should be changed
to "uintptr_t item".

 
   // Returns the address of the attribute in attribute_list with tag |tag|.
   static SecKeychainAttribute* AttributeWithTag(
       const SecKeychainAttributeList& attribute_list,
       UInt32 tag);
 
-  static const int kDummySearchRef = 1000;
+  static const uintptr_t kDummySearchRef = 1000;
 
   typedef struct KeychainPasswordData {
     KeychainPasswordData() : data(NULL), length(0) {}
     void* data;
     UInt32 length;
   } KeychainPasswordData;
 
   // Mutable because the MockKeychain API requires its internal keychain storage
   // to be modifiable by users of this class.
   mutable std::map<unsigned int, SecKeychainAttributeList> keychain_attr_list_;
   mutable std::map<unsigned int, KeychainPasswordData> keychain_data_;
   mutable unsigned int next_item_key_;

[wtc, 2012/07/11 21:15:28]

The key type for the std::map's should probably also be
changed to uintptr_t.  Similarly, next_item_key_ should
probably be changed to uintptr_t.

 
   // Tracks the items that should be returned in subsequent calls to
   // SearchCopyNext, based on the last call to SearchCreateFromAttributes.
   // We can't handle multiple active searches, since we don't track the search
   // ref we return, but we don't need to for our mocking.
   mutable std::vector<unsigned int> remaining_search_results_;
 
   // Track copies and releases to make sure they balance. Really these should
   // be maps to track per item, but this should be good enough to catch
   // real mistakes.
@@ skipping 14 matching lines @@
   // and |ItemFreeContent|.
   mutable unsigned int password_data_count_;
 
   // Records the password being set when |AddGenericPassword()| gets called.
   mutable std::string add_generic_password_;
 };
 
 }  // namespace crypto
 
 #endif  // CRYPTO_MOCK_KEYCHAIN_MAC_H_