Move *keychain_mac* files to crypto/

crypto/keychain_mac.h

Index: crypto/keychain_mac.h
diff --git a/chrome/browser/keychain_mac.h b/crypto/keychain_mac.h
similarity index 53%
rename from chrome/browser/keychain_mac.h
rename to crypto/keychain_mac.h
index f3c98e08dadfcc0836c032b26c8e3ed491b5c5e3..39ba31c85fb5d4d357adde023f9e2ccf5a08a961 100644
--- a/chrome/browser/keychain_mac.h
+++ b/crypto/keychain_mac.h
@@ -1,15 +1,17 @@
-// Copyright (c) 2009 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_KEYCHAIN_MAC_H_
-#define CHROME_BROWSER_KEYCHAIN_MAC_H_
+#ifndef CRYPTO_KEYCHAIN_MAC_H_
+#define CRYPTO_KEYCHAIN_MAC_H_
 #pragma once
 
 #include <Security/Security.h>
 
 #include "base/basictypes.h"
 
+namespace crypto {
+
 // Wraps the KeychainServices API in a very thin layer, to allow it to be
 // mocked out for testing.
 
@@ -20,65 +22,71 @@
 // CFRelease (to aid in testing).
 class MacKeychain {

[wtc, 2012/03/19 22:42:28]

The class is named MacKeychain, but the file is named
keychain_mac.{cc,h} rather than mac_keychain.{cc,h}.
I guess this is because we want to rely on the existing GYP
rule that treat all _mac.* files as Mac only?

[akalin, 2012/03/19 22:50:03]

Yeah, that's what I would guess.  Although come to think of it, MockKeychain
should probably be mock_keychain_mac.*, too.  Maybe mac_keychain_mac would work
better?

[wtc, 2012/03/19 23:03:21]

mac_keychain_mac looks weird.  I am OK with keychain_mac
(less work) or mac_keychain (requires a GYP change to list
thses files in source! for non-mac platforms).

I guess MockKeychain can be renamed MockMacKeychain and
the files renamed mock_mac_keychain.

Probably not worth the trouble...

  public:
-  MacKeychain() {}
-  virtual ~MacKeychain() {}
+  MacKeychain();
+  virtual ~MacKeychain();
 
   virtual OSStatus ItemCopyAttributesAndData(
-      SecKeychainItemRef itemRef, SecKeychainAttributeInfo *info,
-      SecItemClass *itemClass, SecKeychainAttributeList **attrList,
-      UInt32 *length, void **outData) const;
+      SecKeychainItemRef itemRef,
+      SecKeychainAttributeInfo* info,
+      SecItemClass* itemClass,
+      SecKeychainAttributeList** attrList,
+      UInt32* length,
+      void** outData) const;
 
   virtual OSStatus ItemModifyAttributesAndData(
-      SecKeychainItemRef itemRef, const SecKeychainAttributeList *attrList,
-      UInt32 length, const void *data) const;
+      SecKeychainItemRef itemRef,
+      const SecKeychainAttributeList* attrList,
+      UInt32 length,
+      const void* data) const;
 
-  virtual OSStatus ItemFreeAttributesAndData(SecKeychainAttributeList *attrList,
-                                             void *data) const;
+  virtual OSStatus ItemFreeAttributesAndData(SecKeychainAttributeList* attrList,
+                                             void* data) const;
 
   virtual OSStatus ItemDelete(SecKeychainItemRef itemRef) const;
 
   virtual OSStatus SearchCreateFromAttributes(
-      CFTypeRef keychainOrArray, SecItemClass itemClass,
-      const SecKeychainAttributeList *attrList,
-      SecKeychainSearchRef *searchRef) const;
+      CFTypeRef keychainOrArray,
+      SecItemClass itemClass,
+      const SecKeychainAttributeList* attrList,
+      SecKeychainSearchRef* searchRef) const;
 
   virtual OSStatus SearchCopyNext(SecKeychainSearchRef searchRef,
-                                  SecKeychainItemRef *itemRef) const;
+                                  SecKeychainItemRef* itemRef) const;
 
   virtual OSStatus AddInternetPassword(SecKeychainRef keychain,
                                        UInt32 serverNameLength,
-                                       const char *serverName,
+                                       const char* serverName,
                                        UInt32 securityDomainLength,
-                                       const char *securityDomain,
+                                       const char* securityDomain,
                                        UInt32 accountNameLength,
-                                       const char *accountName,
-                                       UInt32 pathLength, const char *path,
+                                       const char* accountName,
+                                       UInt32 pathLength, const char* path,
                                        UInt16 port, SecProtocolType protocol,
                                        SecAuthenticationType authenticationType,
                                        UInt32 passwordLength,
-                                       const void *passwordData,
-                                       SecKeychainItemRef *itemRef) const;
+                                       const void* passwordData,
+                                       SecKeychainItemRef* itemRef) const;
 
   virtual OSStatus FindGenericPassword(CFTypeRef keychainOrArray,
                                        UInt32 serviceNameLength,
-                                       const char *serviceName,
+                                       const char* serviceName,
                                        UInt32 accountNameLength,
-                                       const char *accountName,
-                                       UInt32 *passwordLength,
-                                       void **passwordData,
-                                       SecKeychainItemRef *itemRef) const;
+                                       const char* accountName,
+                                       UInt32* passwordLength,
+                                       void** passwordData,
+                                       SecKeychainItemRef* itemRef) const;
 
-  virtual OSStatus ItemFreeContent(SecKeychainAttributeList *attrList,
-                                   void *data) const;
+  virtual OSStatus ItemFreeContent(SecKeychainAttributeList* attrList,
+                                   void* data) const;
 
   virtual OSStatus AddGenericPassword(SecKeychainRef keychain,
                                       UInt32 serviceNameLength,
-                                      const char *serviceName,
+                                      const char* serviceName,
                                       UInt32 accountNameLength,
-                                      const char *accountName,
+                                      const char* accountName,
                                       UInt32 passwordLength,
-                                      const void *passwordData,
-                                      SecKeychainItemRef *itemRef) const;
+                                      const void* passwordData,
+                                      SecKeychainItemRef* itemRef) const;
 
   // Calls CFRelease on the given ref, after checking that |ref| is non-NULL.
   virtual void Free(CFTypeRef ref) const;
@@ -87,4 +95,6 @@ class MacKeychain {
   DISALLOW_COPY_AND_ASSIGN(MacKeychain);
 };
 
-#endif  // CHROME_BROWSER_KEYCHAIN_MAC_H_
+}  // namespace crypto
+
+#endif  // CRYPTO_KEYCHAIN_MAC_H_