[Android] Send accessory password sheet caption upon creation

This CL sends the corrected strings for passwords right upon creation.
That fixes the issue of having plain white sheets when only the
password generation option is available.

(Later, this same call will also provide the manual password generation
and a link to all passwords.)

Bug: 835234
Change-Id: Ie38b76231e371f6d4bb88b2152c04a3f47dd98cc
Reviewed-on: https://chromium-review.googlesource.com/1110117
Commit-Queue: Friedrich Horschig <fhorschig@chromium.org>
Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569583}

chrome/app/generated_resources.grd

@@ -5289,10 +5289,10 @@ the Bookmarks menu.">
           Password for <ph name="username">$1<ex>Alexander</ex></ph>
         </message>
         <message name="IDS_PASSWORD_MANAGER_ACCESSORY_PASSWORD_LIST_EMPTY_MESSAGE" desc="Message indicating that the list of saved passwords for this site is empty.">
-          No saved passwords for this site.
+          No saved passwords for <ph name="domain">$1<ex>example.com</ex></ph>
         </message>
         <message name="IDS_PASSWORD_MANAGER_ACCESSORY_PASSWORD_LIST_TITLE" desc="The title of a list of saved passwords for the currently visible site.">
-          Passwords
+          Saved passwords for <ph name="domain">$1<ex>example.com</ex></ph>
         </message>
       </if>
 

chrome/browser/password_manager/chrome_password_manager_client.cc

@@ -555,6 +555,13 @@ void ChromePasswordManagerClient::DidFinishNavigation(
   web_contents()->GetRenderViewHost()->GetWidget()->RemoveInputEventObserver(
       this);
   web_contents()->GetRenderViewHost()->GetWidget()->AddInputEventObserver(this);
+#else
+  // Ensure that entries from old origins are properly cleaned up.
+  PasswordAccessoryController* password_accessory =
+      PasswordAccessoryController::FromWebContents(web_contents());
+  if (password_accessory) {
+    password_accessory->DidNavigateMainFrame();
+  }
 #endif
 }
 

chrome/browser/password_manager/password_accessory_controller.cc

@@ -6,6 +6,7 @@
 
 #include <vector>
 
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_accessory_view_interface.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 #include "chrome/grit/generated_resources.h"
@@ -57,16 +58,14 @@ void PasswordAccessoryController::OnPasswordsAvailable(
   }
   DCHECK(view_);
   std::vector<Item> items;
-  base::string16 passwords_title_str = l10n_util::GetStringUTF16(
-      IDS_PASSWORD_MANAGER_ACCESSORY_PASSWORD_LIST_TITLE);
+  base::string16 passwords_title_str;
+  passwords_title_str = l10n_util::GetStringFUTF16(
+      best_matches.empty()
+          ? IDS_PASSWORD_MANAGER_ACCESSORY_PASSWORD_LIST_EMPTY_MESSAGE
+          : IDS_PASSWORD_MANAGER_ACCESSORY_PASSWORD_LIST_TITLE,
+      base::ASCIIToUTF16(origin.host()));
   items.emplace_back(passwords_title_str, passwords_title_str,
                      /*is_password=*/false, Item::Type::LABEL);
-  if (best_matches.empty()) {
-    base::string16 passwords_empty_str = l10n_util::GetStringUTF16(
-        IDS_PASSWORD_MANAGER_ACCESSORY_PASSWORD_LIST_EMPTY_MESSAGE);
-    items.emplace_back(passwords_empty_str, passwords_empty_str,
-                       /*is_password=*/false, Item::Type::LABEL);
-  }
   for (const auto& pair : best_matches) {
     const PasswordForm* form = pair.second;
     base::string16 username = GetDisplayUsername(*form);
@@ -81,6 +80,13 @@ void PasswordAccessoryController::OnPasswordsAvailable(
   view_->OnItemsAvailable(origin, items);
 }
 
+void PasswordAccessoryController::DidNavigateMainFrame() {
+  // Sending no passwords removes stale stuggestions and sends default options.
+  OnPasswordsAvailable(
+      /*best_matches=*/{},
+      web_contents_->GetMainFrame()->GetLastCommittedOrigin().GetURL());
+}
+
 void PasswordAccessoryController::OnFillingTriggered(
     bool is_password,
     const base::string16& textToFill) const {

chrome/browser/password_manager/password_accessory_controller.h

@@ -46,6 +46,9 @@ class PasswordAccessoryController
           best_matches,
       const GURL& origin);
 
+  // Send empty suggestions and default options to the view.
+  void DidNavigateMainFrame();
+
   // Called by the UI code to request that |textToFill| is to be filled into the
   // currently focused field.
   void OnFillingTriggered(bool is_password,
@@ -75,7 +78,7 @@ class PasswordAccessoryController
       content::WebContents* web_contents,
       std::unique_ptr<PasswordAccessoryViewInterface> view);
 
-  // The web page view this accessory sheet and the focused field live in.
+  // The tab for which this class is scoped.
   content::WebContents* web_contents_;
 
   // Hold the native instance of the view. Must be last declared and initialized

chrome/browser/password_manager/password_accessory_controller_unittest.cc

@@ -32,6 +32,9 @@ using testing::StrictMock;
 using AccessoryItem = PasswordAccessoryViewInterface::AccessoryItem;
 using ItemType = AccessoryItem::Type;
 
+constexpr char kExampleSite[] = "https://example.com";
+constexpr char kExampleDomain[] = "example.com";
+
 // The mock view mocks the platform-specific implementation. That also means
 // that we have to care about the lifespan of the Controller because that would
 // usually be responsibility of the view.
@@ -62,6 +65,12 @@ std::string PrintItem(const base::string16& text,
          PrintToString(static_cast<int>(type));
 }
 
+// Compares whether a given AccessoryItem is a label with the given text.
+MATCHER_P(MatchesLabel, text, PrintItem(text, text, false, ItemType::LABEL)) {
+  return arg.text == text && arg.is_password == false &&
+         arg.content_description == text && arg.itemType == ItemType::LABEL;
+}
+
 // Compares whether a given AccessoryItem had the given properties.
 MATCHER_P4(MatchesItem,
            text,
@@ -98,14 +107,15 @@ base::string16 password_for_str(const std::string& user) {
   return password_for_str(ASCIIToUTF16(user));
 }
 
-base::string16 passwords_empty_str() {
-  return l10n_util::GetStringUTF16(
-      IDS_PASSWORD_MANAGER_ACCESSORY_PASSWORD_LIST_EMPTY_MESSAGE);
+base::string16 passwords_empty_str(const std::string& domain) {
+  return l10n_util::GetStringFUTF16(
+      IDS_PASSWORD_MANAGER_ACCESSORY_PASSWORD_LIST_EMPTY_MESSAGE,
+      ASCIIToUTF16(domain));
 }
 
-base::string16 passwords_title_str() {
-  return l10n_util::GetStringUTF16(
-      IDS_PASSWORD_MANAGER_ACCESSORY_PASSWORD_LIST_TITLE);
+base::string16 passwords_title_str(const std::string& domain) {
+  return l10n_util::GetStringFUTF16(
+      IDS_PASSWORD_MANAGER_ACCESSORY_PASSWORD_LIST_TITLE, ASCIIToUTF16(domain));
 }
 
 base::string16 no_user_str() {
@@ -136,6 +146,7 @@ class PasswordAccessoryControllerTest : public ChromeRenderViewHostTestHarness {
  public:
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
+    NavigateAndCommit(GURL(kExampleSite));
     PasswordAccessoryController::CreateForWebContentsForTesting(
         web_contents(),
         std::make_unique<StrictMock<MockPasswordAccessoryView>>());
@@ -164,44 +175,40 @@ TEST_F(PasswordAccessoryControllerTest, TransformsMatchesToSuggestions) {
   EXPECT_CALL(
       *view(),
       OnItemsAvailable(
-          GURL("https://example.com"),
+          GURL(kExampleSite),
           ElementsAre(
-              MatchesItem(ASCIIToUTF16("Passwords"), ASCIIToUTF16("Passwords"),
-                          false, ItemType::LABEL),
+              MatchesLabel(passwords_title_str(kExampleDomain)),
               MatchesItem(ASCIIToUTF16("Ben"), ASCIIToUTF16("Ben"), false,
                           ItemType::SUGGESTION),
               MatchesItem(ASCIIToUTF16("S3cur3"), password_for_str("Ben"), true,
                           ItemType::SUGGESTION))));
 
   controller()->OnPasswordsAvailable({CreateEntry("Ben", "S3cur3").first},
-                                     GURL("https://example.com"));
+                                     GURL(kExampleSite));
 }
 
 TEST_F(PasswordAccessoryControllerTest, HintsToEmptyUserNames) {
-  EXPECT_CALL(
-      *view(),
-      OnItemsAvailable(GURL("https://example.com"),
-                       ElementsAre(MatchesItem(ASCIIToUTF16("Passwords"),
-                                               ASCIIToUTF16("Passwords"), false,
-                                               ItemType::LABEL),
-                                   MatchesItem(no_user_str(), no_user_str(),
-                                               false, ItemType::SUGGESTION),
-                                   MatchesItem(ASCIIToUTF16("S3cur3"),
-                                               password_for_str(no_user_str()),
-                                               true, ItemType::SUGGESTION))));
+  EXPECT_CALL(*view(),
+              OnItemsAvailable(
+                  GURL(kExampleSite),
+                  ElementsAre(MatchesLabel(passwords_title_str(kExampleDomain)),
+                              MatchesItem(no_user_str(), no_user_str(), false,
+                                          ItemType::SUGGESTION),
+                              MatchesItem(ASCIIToUTF16("S3cur3"),
+                                          password_for_str(no_user_str()), true,
+                                          ItemType::SUGGESTION))));
 
   controller()->OnPasswordsAvailable({CreateEntry("", "S3cur3").first},
-                                     GURL("https://example.com"));
+                                     GURL(kExampleSite));
 }
 
 TEST_F(PasswordAccessoryControllerTest, SortsAlphabeticalDuringTransform) {
   EXPECT_CALL(
       *view(),
       OnItemsAvailable(
-          GURL("https://example.com"),
+          GURL(kExampleSite),
           ElementsAre(
-              MatchesItem(passwords_title_str(), passwords_title_str(), false,
-                          ItemType::LABEL),
+              MatchesLabel(passwords_title_str(kExampleDomain)),
 
               MatchesItem(ASCIIToUTF16("Alf"), ASCIIToUTF16("Alf"), false,
                           ItemType::SUGGESTION),
@@ -226,20 +233,33 @@ TEST_F(PasswordAccessoryControllerTest, SortsAlphabeticalDuringTransform) {
   controller()->OnPasswordsAvailable(
       {CreateEntry("Ben", "S3cur3").first, CreateEntry("Zebra", "M3h").first,
        CreateEntry("Alf", "PWD").first, CreateEntry("Cat", "M1@u").first},
-      GURL("https://example.com"));
+      GURL(kExampleSite));
+}
+
+TEST_F(PasswordAccessoryControllerTest, ClearsSuggestionsOnFrameNavigation) {
+  // Set any, non-empty password list.
+  EXPECT_CALL(*view(), OnItemsAvailable(GURL(kExampleSite), _));
+  controller()->OnPasswordsAvailable({CreateEntry("Ben", "S3cur3").first},
+                                     GURL(kExampleSite));
+
+  // Pretend that a navigation happened.
+  EXPECT_CALL(
+      *view(),
+      OnItemsAvailable(
+          GURL(kExampleSite),
+          ElementsAre(MatchesLabel(passwords_empty_str(kExampleDomain)))));
+
+  controller()->DidNavigateMainFrame();
 }
 
 TEST_F(PasswordAccessoryControllerTest, ProvidesEmptySuggestionsMessage) {
-  EXPECT_CALL(*view(), OnItemsAvailable(
-                           GURL("https://example.com"),
-                           ElementsAre(MatchesItem(ASCIIToUTF16("Passwords"),
-                                                   ASCIIToUTF16("Passwords"),
-                                                   false, ItemType::LABEL),
-                                       MatchesItem(passwords_empty_str(),
-                                                   passwords_empty_str(), false,
-                                                   ItemType::LABEL))));
-
-  controller()->OnPasswordsAvailable({}, GURL("https://example.com"));
+  EXPECT_CALL(
+      *view(),
+      OnItemsAvailable(
+          GURL(kExampleSite),
+          ElementsAre(MatchesLabel(passwords_empty_str(kExampleDomain)))));
+
+  controller()->OnPasswordsAvailable({}, GURL(kExampleSite));
 }
 
 TEST_F(PasswordAccessoryControllerTest, IgnoresCrossOriginCalls) {