Remove references to Gnome Keyring in //docs

R=thestig

Change-Id: I4bda56ba4328a590e06e43fadbc3c461eec1407f
Bug: 355223
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4607551
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1157637}

diff --git a/docs/linux/build_instructions.md b/docs/linux/build_instructions.md
index ff04be2..b51299e 100644
--- a/docs/linux/build_instructions.md
+++ b/docs/linux/build_instructions.md

@@ -412,8 +412,8 @@
 
 ```shell
 $ sudo pacman -S --needed python perl gcc gcc-libs bison flex gperf pkgconfig \
-nss alsa-lib glib2 gtk3 nspr freetype2 cairo dbus libgnome-keyring \
-xorg-server-xvfb xorg-xdpyinfo
+nss alsa-lib glib2 gtk3 nspr freetype2 cairo dbus xorg-server-xvfb \
+xorg-xdpyinfo
 ```
 
 For the optional packages on Arch Linux:
@@ -447,11 +447,10 @@
 cups-devel dbus-devel dbus-glib-devel expat-devel fontconfig-devel \
 freetype-devel gcc-c++ glib2-devel glibc.i686 gperf glib2-devel \
 gtk3-devel java-1.*.0-openjdk-devel libatomic libcap-devel libffi-devel \
-libgcc.i686 libgnome-keyring-devel libjpeg-devel libstdc++.i686 libX11-devel \
-libXScrnSaver-devel libXtst-devel libxkbcommon-x11-devel ncurses-compat-libs \
-nspr-devel nss-devel pam-devel pango-devel pciutils-devel \
-pulseaudio-libs-devel zlib.i686 httpd mod_ssl php php-cli python-psutil wdiff \
-xorg-x11-server-Xvfb'
+libgcc.i686 libjpeg-devel libstdc++.i686 libX11-devel libXScrnSaver-devel \
+libXtst-devel libxkbcommon-x11-devel ncurses-compat-libs nspr-devel nss-devel \
+pam-devel pango-devel pciutils-devel pulseaudio-libs-devel zlib.i686 httpd \
+mod_ssl php php-cli python-psutil wdiff xorg-x11-server-Xvfb'
 ```
 
 The fonts needed by Blink's web tests can be obtained by following [these

diff --git a/docs/linux/password_storage.md b/docs/linux/password_storage.md
index 0418e64..e32edc6f 100644
--- a/docs/linux/password_storage.md
+++ b/docs/linux/password_storage.md

@@ -1,21 +1,22 @@
 # Linux Password Storage
 
-On Linux, Chromium can store passwords in three ways:
+On Linux, Chromium can store passwords in four ways:
 
-*   GNOME Keyring
+*   GNOME Libsecret
 *   KWallet 4
+*   KWallet 5
 *   plain text
 
 Chromium chooses which store to use automatically, based on your desktop
 environment.
 
-Passwords stored in GNOME Keyring or KWallet are encrypted on disk, and access
+Passwords stored in KWallet are encrypted on disk, and access
 to them is controlled by dedicated daemon software. Passwords stored in plain
-text are not encrypted. Because of this, when either GNOME Keyring or KWallet is
+text are not encrypted. Because of this, when KWallet is
 in use, any unencrypted passwords that have been stored previously are
 automatically moved into the encrypted store.
 
-Support for using GNOME Keyring and KWallet was added in version 6, but using
+Support for using KWallet was added in version 6, but using
 these (when available) was not made the default mode until version 12.
 
 ## Details
@@ -23,8 +24,9 @@
 Although Chromium chooses which store to use automatically, the store to use can
 also be specified with a command line argument:
 
-*   `--password-store=gnome` (to use GNOME Keyring)
-*   `--password-store=kwallet` (to use KWallet)
+*   `--password-store=gnome-libsecret` (to use GNOME Libsecret)
+*   `--password-store=kwallet` (to use KWallet 4)
+*   `--password-store=kwallet5` (to use KWallet 5)
 *   `--password-store=basic` (to use the plain text store)
 
 Note that Chromium will fall back to `basic` if a requested or autodetected

diff --git a/docs/security/faq.md b/docs/security/faq.md
index ab55f6bf..1ce9576 100644
--- a/docs/security/faq.md
+++ b/docs/security/faq.md

@@ -851,11 +851,11 @@
      encrypted on disk with a key that is then stored in the user's Keychain.
      See [Issue 466638](https://crbug.com/466638) for further explanation.
 *    On Linux, Chrome previously stored credentials directly in the user's
-     Gnome Keyring or KWallet, but for technical reasons, it has switched to
+     Gnome Secret Service or KWallet, but for technical reasons, it has switched to
      storing the credentials in "Login Data" in the Chrome user's profile directory,
      but encrypted on disk with a key that is then stored in the user's Gnome
-     Keyring or KWallet. If there is no available Keyring or KWallet, the data is
-     not encrypted when stored.
+     Secret Service or KWallet. If there is no available Secret Service or KWallet,
+     the data is not encrypted when stored.
 *    On iOS, passwords are currently stored directly in the iOS Keychain and
      referenced from the rest of the metadata stored in a separate DB. The plan
      there is to just store them in plain text in the DB, because iOS gives