Remove password export flag on Android

The feature has been enabled in stable releases for a number of
versions by now, hence the flag can be safely removed.

Bug: 838789
Change-Id: I172df59564d881c8c7b6b5cad3b49d0971fc0251
Reviewed-on: https://chromium-review.googlesource.com/1195489
Commit-Queue: Vaclav Brozek <vabr@chromium.org>
Reviewed-by: Friedrich Horschig [CEST] <fhorschig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588156}

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

@@ -20,7 +20,6 @@ import org.chromium.base.ContextUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.ui.widget.Toast;
 
 import java.io.File;
@@ -72,9 +71,6 @@ public class ExportFlow {
     @ExportState
     private int mExportState;
 
-    /** Name of the feature controlling the password export functionality. */
-    private static final String EXPORT_PASSWORDS = "PasswordExport";
-
     /** Name of the subdirectory in cache which stores the exported passwords file. */
     private static final String PASSWORDS_CACHE_DIR = "/passwords";
 
@@ -594,10 +590,9 @@ public class ExportFlow {
 
     /**
      * Returns whether the password export feature is ready to use.
-     * @return Returns true if the flag is set and the Reauthentication Api is available.
+     * @return Returns true if the Reauthentication Api is available.
      */
     public static boolean providesPasswordExport() {
-        return ChromeFeatureList.isEnabled(EXPORT_PASSWORDS)
-                && ReauthenticationManager.isReauthenticationApiAvailable();
+        return ReauthenticationManager.isReauthenticationApiAvailable();
     }
 }

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

@@ -542,7 +542,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportMenuDisabled() throws Exception {
         // Ensure there are no saved passwords reported to settings.
         setPasswordSource(null);
@@ -562,7 +561,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportMenuEnabled() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -575,37 +573,12 @@ public class SavePasswordsPreferencesTest {
         checkExportMenuItemState(MenuItemState.ENABLED);
     }
 
-    /**
-     * Check that if "PasswordExport" feature is not explicitly enabled, there is no menu item to
-     * export passwords.
-     */
-    @Test
-    @SmallTest
-    @Feature({"Preferences"})
-    @DisableFeatures("PasswordExport")
-    public void testExportMenuMissing() throws Exception {
-        ReauthenticationManager.setApiOverride(ReauthenticationManager.OverrideState.AVAILABLE);
-
-        final Preferences preferences =
-                PreferencesTest.startPreferences(InstrumentationRegistry.getInstrumentation(),
-                        SavePasswordsPreferences.class.getName());
-
-        // Ideally this would need the same matcher (Espresso.OVERFLOW_BUTTON_MATCHER) as used
-        // inside Espresso.openActionBarOverflowOrOptionsMenu(), but that is private to Espresso.
-        // Matching the overflow menu with the class name "OverflowMenuButton" won't work on
-        // obfuscated release builds, so matching the description remains. The
-        // OVERFLOW_BUTTON_MATCHER specifies the string directly, not via string resource, so this
-        // is also done below.
-        Espresso.onView(withContentDescription("More options")).check(doesNotExist());
-    }
-
     /**
      * Check that tapping the export menu requests the passwords to be serialised in the background.
      */
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportTriggersSerialization() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -637,7 +610,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportMenuItem() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -672,7 +644,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportReauthAfterCancel() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -727,7 +698,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportMenuItemNoLock() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -756,7 +726,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportMenuItemReenabledNoLock() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -785,7 +754,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportMenuItemReenabledReauthFailure() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -818,7 +786,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportRequiresReauth() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -858,7 +825,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportIntent() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -915,7 +881,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportIntentPaused() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -976,7 +941,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportCancelOnWarning() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -1004,7 +968,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportWarningOnResume() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -1045,7 +1008,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportWarningTimeoutOnResume() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -1093,7 +1055,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportCancelOnWarningDismissal() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -1124,7 +1085,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportProgressMinimalTime() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -1188,7 +1148,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportProgress() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -1245,7 +1204,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportCancelOnProgress() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -1291,7 +1249,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportCancelOnError() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -1333,7 +1290,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportRetry() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -1371,7 +1327,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportHelpSite() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 
@@ -1420,7 +1375,6 @@ public class SavePasswordsPreferencesTest {
     @Test
     @SmallTest
     @Feature({"Preferences"})
-    @EnableFeatures("PasswordExport")
     public void testExportErrorUiAfterConfirmation() throws Exception {
         setPasswordSource(new SavedPasswordEntry("https://example.com", "test user", "password"));
 

chrome/browser/about_flags.cc

@@ -2790,9 +2790,6 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kProtectSyncCredentialOnReauthDescription, kOsAll,
      FEATURE_VALUE_TYPE(
          password_manager::features::kProtectSyncCredentialOnReauth)},
-    {"PasswordExport", flag_descriptions::kPasswordExportName,
-     flag_descriptions::kPasswordExportDescription, kOsAll,
-     FEATURE_VALUE_TYPE(password_manager::features::kPasswordExport)},
     {"PasswordImport", flag_descriptions::kPasswordImportName,
      flag_descriptions::kPasswordImportDescription, kOsAll,
      FEATURE_VALUE_TYPE(password_manager::features::kPasswordImport)},

chrome/browser/android/chrome_feature_list.cc

@@ -168,7 +168,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &offline_pages::kPrefetchingOfflinePagesFeature,
     &omnibox::kQueryInOmnibox,
     &omnibox::kUIExperimentHideSteadyStateUrlSchemeAndSubdomains,
-    &password_manager::features::kPasswordExport,
     &password_manager::features::kPasswordSearchMobile,
     &password_manager::features::kPasswordsKeyboardAccessory,
     &unified_consent::kUnifiedConsent,

chrome/browser/flag_descriptions.cc

@@ -1438,10 +1438,6 @@ const char kPassiveDocumentWheelEventListenersDescription[] =
     "Forces wheel, and mousewheel event listeners on document level targets "
     "(which haven't requested otherwise) to be treated as passive.";
 
-const char kPasswordExportName[] = "Password export";
-const char kPasswordExportDescription[] =
-    "Export functionality in password settings.";
-
 const char kPasswordImportName[] = "Password import";
 const char kPasswordImportDescription[] =
     "Import functionality in password settings.";

chrome/browser/flag_descriptions.h

@@ -882,9 +882,6 @@ extern const char kPassiveDocumentEventListenersDescription[];
 extern const char kPassiveDocumentWheelEventListenersName[];
 extern const char kPassiveDocumentWheelEventListenersDescription[];
 
-extern const char kPasswordExportName[];
-extern const char kPasswordExportDescription[];
-
 extern const char kPasswordImportName[];
 extern const char kPasswordImportDescription[];