fix merge misses

blueboxd · Feb 15, 2024 · c331b90 · c331b90
1 parent 49afb46
commit c331b90
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/chrome/browser/ui/cocoa/share_menu_controller.mm b/chrome/browser/ui/cocoa/share_menu_controller.mm
@@ -20,7 +20,7 @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/omnibox/browser/location_bar_model.h"
-#include "net/base/mac/url_conversions.h"
+#include "net/base/apple/url_conversions.h"
 #include "ui/base/accelerators/platform_accelerator_cocoa.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/gfx/geometry/rect.h"

diff --git a/device/fido/mac/credential_store.mm b/device/fido/mac/credential_store.mm
@@ -203,7 +203,8 @@ bool DoDeleteWebAuthnCredentials(const std::string& keychain_access_group,
     CFDictionarySetValue(delete_query.get(), kSecClass, kSecClassKey);
     CFDictionarySetValue(delete_query.get(), kSecAttrApplicationLabel,
                          sec_attr_app_label);
-    OSStatus status = Keychain::GetInstance().ItemDelete(delete_query.get());
+    OSStatus status =
+        crypto::AppleKeychainV2::GetInstance().ItemDelete(delete_query.get());
     if (status != errSecSuccess) {
       OSSTATUS_DLOG(ERROR, status) << "SecItemDelete failed";
       result = false;