Move *keychain_mac* files to crypto/

chrome/browser/password_manager/password_store_mac_internal.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_PASSWORD_MANAGER_PASSWORD_STORE_MAC_INTERNAL_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_INTERNAL_H_
 #pragma once
 
 #include <Security/Security.h>
 
 #include <string>
 #include <vector>
 
 #include "base/time.h"
-#include "chrome/browser/keychain_mac.h"
+#include "crypto/keychain_mac.h"
+
+using crypto::MacKeychain;
 
 // Adapter that wraps a MacKeychain and provides interaction in terms of
 // PasswordForms instead of Keychain items.
 class MacKeychainPasswordFormAdapter {
  public:
   // Creates an adapter for |keychain|. This class does not take ownership of
   // |keychain|, so the caller must make sure that the keychain outlives the
   // created object.
-  explicit MacKeychainPasswordFormAdapter(const MacKeychain* keychain);
+  explicit MacKeychainPasswordFormAdapter(
+      const MacKeychain* keychain);

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

Does this fit on one line?

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

Done.

 
   // Returns PasswordForms for each keychain entry that could be used to fill
   // |form|. Caller is responsible for deleting the returned forms.
   std::vector<webkit::forms::PasswordForm*> PasswordsFillingForm(
       const webkit::forms::PasswordForm& query_form);
 
   // Returns PasswordForms for each keychain entry that could be merged with
   // |form|. Differs from PasswordsFillingForm in that the username must match.
   // Caller is responsible for deleting the returned forms.
   std::vector<webkit::forms::PasswordForm*> PasswordsMergeableWithForm(
@@ skipping 130 matching lines @@
 // Fills in the passwords for as many of the forms in |database_forms| as
 // possible using entries from |keychain| and returns them. On return,
 // |database_forms| will contain only the forms for which no password was found.
 std::vector<webkit::forms::PasswordForm*> GetPasswordsForForms(
     const MacKeychain& keychain,
     std::vector<webkit::forms::PasswordForm*>* database_forms);
 
 }  // internal_keychain_helpers
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_MAC_INTERNAL_H_