Move *keychain_mac* files to crypto/

crypto/mock_keychain_mac.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 CHROME_BROWSER_MOCK_KEYCHAIN_MAC_H_
-#define CHROME_BROWSER_MOCK_KEYCHAIN_MAC_H_
+#ifndef CRYPTO_MOCK_KEYCHAIN_MAC_H_
+#define CRYPTO_MOCK_KEYCHAIN_MAC_H_
 #pragma once
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/keychain_mac.h"
+#include "crypto/keychain_mac.h"
+
+namespace crypto {
 
 // Mock Keychain wrapper for testing code that interacts with the OS Keychain.

[Ryan Sleevi, 2012/03/16 20:58:37]

nit: OS X Keychain?

[akalin, 2012/03/17 07:19:44]

Done.

 // Implemented by storing SecKeychainAttributeList and KeychainPasswordData
 // values in separate mutable containers and mapping them to integer keys.
 //
 // Note that "const" is pretty much meaningless for this class; the const-ness
 // of MacKeychain doesn't apply to the actual keychain data, so all of the Mock
 // data is mutable; don't assume that it won't change over the life of tests.
 class MockKeychain : public MacKeychain {
  public:
   MockKeychain();
   virtual ~MockKeychain();
   virtual OSStatus ItemCopyAttributesAndData(

[Ryan Sleevi, 2012/03/16 20:58:37]

Per http://www.chromium.org/developers/coding-style#TOC-Code-formatting , and
ultimately a small nit, can you explicitly specify the interface this implements
(yes yes, it's "obvious")

Also, line breaks as previously mentioned.

[akalin, 2012/03/17 07:19:44]

Done.

       SecKeychainItemRef itemRef, SecKeychainAttributeInfo *info,
       SecItemClass *itemClass, SecKeychainAttributeList **attrList,
       UInt32 *length, void **outData) const OVERRIDE;
   // Pass "fail_me" as the data to get errSecAuthFailed.
   virtual OSStatus ItemModifyAttributesAndData(
       SecKeychainItemRef itemRef, const SecKeychainAttributeList *attrList,
       UInt32 length, const void *data) const OVERRIDE;
   virtual OSStatus ItemFreeAttributesAndData(SecKeychainAttributeList *attrList,
                                              void *data) const OVERRIDE;
   virtual OSStatus ItemDelete(SecKeychainItemRef itemRef) const OVERRIDE;
@@ skipping 158 matching lines @@
   mutable bool called_add_generic_;
 
   // Tracks the allocations and frees of password data in |FindGenericPassword|
   // and |ItemFreeContent|.
   mutable unsigned int password_data_count_;
 
   // Records the password being set when |AddGenericPassword()| gets called.
   mutable std::string add_generic_password_;
 };
 
-#endif  // CHROME_BROWSER_MOCK_KEYCHAIN_MAC_H_
+}  // namespace crypto
+
+#endif  // CRYPTO_MOCK_KEYCHAIN_MAC_H_