Update from https://crrev.com/312398

crypto/mock_apple_keychain.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_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 33 matching lines @@
                            void* data) const override;
   OSStatus AddGenericPassword(SecKeychainRef keychain,
                               UInt32 serviceNameLength,
                               const char* serviceName,
                               UInt32 accountNameLength,
                               const char* accountName,
                               UInt32 passwordLength,
                               const void* passwordData,
                               SecKeychainItemRef* itemRef) const override;
 
+  // Returns the password that OSCrypt uses to generate its encryption key.
+  std::string GetEncryptionPassword() const;
+
 #if !defined(OS_IOS)
   OSStatus ItemCopyAttributesAndData(SecKeychainItemRef itemRef,
                                      SecKeychainAttributeInfo* info,
                                      SecItemClass* itemClass,
                                      SecKeychainAttributeList** attrList,
                                      UInt32* length,
                                      void** outData) const override;
   // Pass "fail_me" as the data to get errSecAuthFailed.
   OSStatus ItemModifyAttributesAndData(SecKeychainItemRef itemRef,
                                        const SecKeychainAttributeList* attrList,
@@ skipping 174 matching lines @@
   // and |ItemFreeContent|.
   mutable 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_