Empty the passwords search results completely

This CL completely drops all UI elements that previously popped back
in when the results are empty.
Reason being, that
1. the link would redirect the user to the same passwords that are
 synced to the device they are using right now.
2. the "Saved passwords appear here" text would indicate that the user
 hasn't saved any passwords yet which is not correct. (Another text is
 not necessary as the interaction with the search field should give
 enough context for the empty list).

Bug: 807300,807302
Change-Id: Ice2dab3a5f6ee280a33ef559d540cc0ca6e082cc
Reviewed-on: https://chromium-review.googlesource.com/894002
Commit-Queue: Friedrich Horschig <fhorschig@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#533237}

chrome/android/java/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferences.java

@@ -500,8 +500,8 @@ public class SavePasswordsPreferences
         }
         mNoPasswords = profileCategory.getPreferenceCount() == 0;
         if (mNoPasswords) {
-            displayManageAccountLink(); // Maybe the password is just not on the device.
-            displayEmptyScreenMessage();
+            if (count == 0) displayEmptyScreenMessage(); // Show if the list was already empty.
+            getPreferenceScreen().removePreference(profileCategory);
         }
     }
 

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/password/SavePasswordsPreferencesTest.java

@@ -836,16 +836,16 @@ public class SavePasswordsPreferencesTest {
     @SmallTest
     @Feature({"Preferences"})
     @EnableFeatures(ChromeFeatureList.PASSWORD_SEARCH)
-    public void testSearchDisplaysAccountLinkIfSearchTurnsUpEmpty() throws Exception {
+    public void testSearchDisplaysBlankPageIfSearchTurnsUpEmpty() throws Exception {
         setPasswordSourceWithMultipleEntries(GREEK_GODS);
         PreferencesTest.startPreferences(InstrumentationRegistry.getInstrumentation(),
                 SavePasswordsPreferences.class.getName());
+        Espresso.onView(withText(startsWith("View and manage"))).check(matches(isDisplayed()));
 
         // Open the search which should hide the Account link.
         Espresso.onView(withSearchMenuIdOrText()).perform(click());
-        Espresso.onView(withText(startsWith("View and manage"))).check(doesNotExist());
 
-        // Search for a string that matches nothing which should bring the Account link back.
+        // Search for a string that matches nothing which should leave the results entirely blank.
         Espresso.onView(withId(R.id.search_src_text))
                 .perform(click(), typeText("Mars"), closeSoftKeyboard());
 
@@ -853,7 +853,9 @@ public class SavePasswordsPreferencesTest {
             Espresso.onView(allOf(withText(god.getUserName()), withText(god.getUrl())))
                     .check(doesNotExist());
         }
-        Espresso.onView(withText(startsWith("View and manage"))).check(matches(isDisplayed()));
+        Espresso.onView(withText(startsWith("View and manage"))).check(doesNotExist());
+        Espresso.onView(withText(R.string.saved_passwords_none_text)).check(doesNotExist());
+        Espresso.onView(withText(R.string.section_saved_passwords)).check(doesNotExist());
     }
 
     /**