[epiphany/mcatanzaro/passwords: 2/2] Fix naming issues with password manager username query functions

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 5784c8c418472c3b7ad8b88156f9a364ab390846
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Mar 3 18:34:17 2019 -0600

    Fix naming issues with password manager username query functions
    
    I thought this was a serious bug because some functions were misnamed.
    The username cache is an implementation detail. It contains all known
    usernames that could be associated with passwords for a given origin.
    So the functions should be named accordingly. This way we "query
    usernames" all the way into the EphyPasswordManager, rather than
    switching from "query usernames" to "cached users" at the process
    boundary.

 embed/ephy-embed-shell.c         | 17 ++++++++---------
 embed/ephy-web-extension-proxy.c | 10 +++++-----
 embed/ephy-web-extension-proxy.h |  2 +-
 lib/sync/ephy-password-manager.c |  4 ++--
 lib/sync/ephy-password-manager.h |  2 +-
 5 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 37b79339b..eeb97d4d8 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -554,9 +554,9 @@ web_extension_password_manager_request_save_received_cb (WebKitUserContentManage
 }
 
 static void
-web_extension_password_manager_cached_users_received_cb (WebKitUserContentManager *manager,
-                                                         WebKitJavascriptResult   *message,
-                                                         EphyEmbedShell           *shell)
+web_extension_password_manager_query_usernames_received_cb (WebKitUserContentManager *manager,
+                                                            WebKitJavascriptResult   *message,
+                                                            EphyEmbedShell           *shell)
 {
   EphyEmbedShellPrivate *priv = ephy_embed_shell_get_instance_private (shell);
 
@@ -565,13 +565,12 @@ web_extension_password_manager_cached_users_received_cb (WebKitUserContentManage
   gint32 promise_id = property_to_int32 (value, "promiseID");
   guint64 page_id = property_to_uint64 (value, "pageID");
 
-  GList *cached_users;
-  cached_users = ephy_password_manager_get_cached_users (priv->password_manager, origin);
+  GList *usernames;
+  usernames = ephy_password_manager_get_usernames_for_origin (priv->password_manager, origin);
 
-  EphyWebExtensionProxy *proxy = ephy_embed_shell_get_extension_proxy_for_page_id (
-                                    shell, page_id, origin);
+  EphyWebExtensionProxy *proxy = ephy_embed_shell_get_extension_proxy_for_page_id (shell, page_id, origin);
   if (proxy)
-    ephy_web_extension_proxy_password_cached_users_response (proxy, cached_users, promise_id, page_id);
+    ephy_web_extension_proxy_password_query_usernames_response (proxy, usernames, promise_id, page_id);
 }
 
 static void
@@ -1192,7 +1191,7 @@ ephy_embed_shell_startup (GApplication *application)
                                                                         "passwordManagerQueryUsernames",
                                                                         priv->guid);
   g_signal_connect (priv->user_content, "script-message-received::passwordManagerQueryUsernames",
-                    G_CALLBACK (web_extension_password_manager_cached_users_received_cb),
+                    G_CALLBACK (web_extension_password_manager_query_usernames_received_cb),
                     shell);
 
   webkit_user_content_manager_register_script_message_handler_in_world (priv->user_content,
diff --git a/embed/ephy-web-extension-proxy.c b/embed/ephy-web-extension-proxy.c
index 2e60c0365..ed58be859 100644
--- a/embed/ephy-web-extension-proxy.c
+++ b/embed/ephy-web-extension-proxy.c
@@ -296,10 +296,10 @@ ephy_web_extension_proxy_history_clear (EphyWebExtensionProxy *web_extension)
 }
 
 void
-ephy_web_extension_proxy_password_cached_users_response (EphyWebExtensionProxy *web_extension,
-                                                         GList                 *users,
-                                                         gint32                 promise_id,
-                                                         guint64                page_id)
+ephy_web_extension_proxy_password_query_usernames_response (EphyWebExtensionProxy *web_extension,
+                                                            GList                 *users,
+                                                            gint32                 promise_id,
+                                                            guint64                page_id)
 {
   if (!web_extension->proxy)
     return;
@@ -335,4 +335,4 @@ ephy_web_extension_proxy_password_query_response (EphyWebExtensionProxy *web_ext
                      -1,
                      web_extension->cancellable,
                      NULL, NULL);
-}
\ No newline at end of file
+}
diff --git a/embed/ephy-web-extension-proxy.h b/embed/ephy-web-extension-proxy.h
index c0c5b0202..10652d41f 100644
--- a/embed/ephy-web-extension-proxy.h
+++ b/embed/ephy-web-extension-proxy.h
@@ -42,7 +42,7 @@ void                   ephy_web_extension_proxy_history_delete_url
 void                   ephy_web_extension_proxy_history_delete_host                       
(EphyWebExtensionProxy *web_extension,
                                                                                            const char        
    *host);
 void                   ephy_web_extension_proxy_history_clear                             
(EphyWebExtensionProxy *web_extension);
-void                   ephy_web_extension_proxy_password_cached_users_response            
(EphyWebExtensionProxy *web_extension,
+void                   ephy_web_extension_proxy_password_query_usernames_response         
(EphyWebExtensionProxy *web_extension,
                                                                                            GList             
    *users,
                                                                                            gint32            
     promise_id,
                                                                                            guint64           
     page_id);
diff --git a/lib/sync/ephy-password-manager.c b/lib/sync/ephy-password-manager.c
index f088943f9..2d138d674 100644
--- a/lib/sync/ephy-password-manager.c
+++ b/lib/sync/ephy-password-manager.c
@@ -341,8 +341,8 @@ ephy_password_manager_new (void)
 }
 
 GList *
-ephy_password_manager_get_cached_users (EphyPasswordManager *self,
-                                        const char          *origin)
+ephy_password_manager_get_usernames_for_origin (EphyPasswordManager *self,
+                                                const char          *origin)
 {
   g_assert (EPHY_IS_PASSWORD_MANAGER (self));
   g_assert (origin);
diff --git a/lib/sync/ephy-password-manager.h b/lib/sync/ephy-password-manager.h
index 2f79b82e2..9ec1da65c 100644
--- a/lib/sync/ephy-password-manager.h
+++ b/lib/sync/ephy-password-manager.h
@@ -47,7 +47,7 @@ G_DECLARE_FINAL_TYPE (EphyPasswordManager, ephy_password_manager, EPHY, PASSWORD
 typedef void (*EphyPasswordManagerQueryCallback) (GList *records, gpointer user_data);
 
 EphyPasswordManager *ephy_password_manager_new                      (void);
-GList               *ephy_password_manager_get_cached_users         (EphyPasswordManager *self,
+GList               *ephy_password_manager_get_usernames_for_origin (EphyPasswordManager *self,
                                                                      const char          *origin);
 void                 ephy_password_manager_save                     (EphyPasswordManager *self,
                                                                      const char          *origin,