| commit | 32396671f51fdd5b1b60f45507b997337b00bcb6 | [log] [tgz] |
|---|---|---|
| author | Owen Min <[email protected]> | Thu Oct 08 16:12:36 2020 |
| committer | Commit Bot <[email protected]> | Thu Oct 08 16:12:36 2020 |
| tree | a7d4c9e15f967f6af0200f6a5cddd2ef3ac8a604 | |
| parent | 5b1bdc55fdbb501e3de835d89aecf6d32de8a050 [diff] |
Merge "Stop recreating keychain item for SC private API" Merge into M87 The chrome.enterprise.reporting_private.getPersistentSecret return -25300(errSecItemNotFound). It's likely caused by keychain item recreation. Disable the feature for now to relieve the issue on Stable. Bug: 1136089 (cherry picked from commit 7697f17e6b7e9beb34e5f2ac0b092d389ca8ca3b) Change-Id: Icbd96ce81a448e1069c3adee08bfca19a66b4bed Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2456509 Reviewed-by: Julian Pastarmov <[email protected]> Reviewed-by: Owen Min <[email protected]> Commit-Queue: Owen Min <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#814698} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2461975 Cr-Commit-Position: refs/branch-heads/4280@{#147} Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
diff --git a/chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc b/chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc index 12952b73..1e81815 100644 --- a/chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc +++ b/chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
@@ -189,12 +189,6 @@ if (status == noErr) { *password = std::string(static_cast<char*>(password_data), password_length); keychain.ItemFreeContent(password_data); - bool keep_password; - status = RecreateKeychainItemIfNecessary( - kServiceName, kAccountName, *password, item_ref.get(), &keep_password); - - if (!keep_password) - password->clear(); return status; }