 
     func removeAccountMetadata() {
         self.prefs.removeObjectForKey(PrefsKeys.KeyLastRemoteTabSyncTime)
-        KeychainWrapper.standard.removeObject(forKey: self.name + ".account")
+        self.keychain.removeObject(forKey: self.name + ".account")
     }
 
     func removeExistingAuthenticationInfo() {
-        KeychainWrapper.standard.setAuthenticationInfo(nil)
+        self.keychain.setAuthenticationInfo(nil)
     }
 }

open class BrowserProfile: Profile {
    
    fileprivate let name: String
    internal let files: FileAccessor

    weak fileprivate var app: UIApplication?

            }
        }

        let baseBundleIdentifier = AppInfo.baseBundleIdentifier
        if !baseBundleIdentifier.isEmpty {
            self.keychain = KeychainWrapper(serviceName: baseBundleIdentifier)
        } else {
            log.error("Unable to get the base bundle identifier. Keychain data will not be shared.")
            self.keychain = KeychainWrapper.standard
        }
        
        let notificationCenter = NotificationCenter.default
        notificationCenter.addObserver(self, selector: #selector(BrowserProfile.onProfileDidFinishSyncing(_:)), name: NotificationProfileDidFinishSyncing, object: nil)
        notificationCenter.addObserver(self, selector: #selector(BrowserProfile.onPrivateDataClearedHistory(_:)), name: NotificationPrivateDataClearedHistory, object: nil)

        // If the profile dir doesn't exist yet, this is first run (for this profile).
        if !files.exists("") {
