🤝 Enable Trusted Web Activities on Stable.

This includes two small UX changes - one a word change and one
disabling the persistent notification.

TWAs will still be behind a flag (which is on by default).

Bug: 908052
Change-Id: I3ddb16bc425a437d9fed215e4285c5eba2d20ba0
Reviewed-on: https://chromium-review.googlesource.com/c/1349337Reviewed-by: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Commit-Queue: Peter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610585}

chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/TrustedWebActivityCoordinator.java

@@ -4,12 +4,10 @@
 
 package org.chromium.chrome.browser.browserservices.trustedwebactivityui;
 
-import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.PersistentNotificationController;
 import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityDisclosureController;
 import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityOpenTimeRecorder;
 import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityToolbarController;
 import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityVerifier;
-import org.chromium.chrome.browser.browserservices.trustedwebactivityui.view.PersistentNotificationView;
 import org.chromium.chrome.browser.browserservices.trustedwebactivityui.view.TrustedWebActivityDisclosureView;
 import org.chromium.chrome.browser.browserservices.trustedwebactivityui.view.TrustedWebActivityToolbarView;
 import org.chromium.chrome.browser.customtabs.CloseButtonNavigator;
@@ -25,12 +23,10 @@ import javax.inject.Inject;
 public class TrustedWebActivityCoordinator {
     @Inject
     public TrustedWebActivityCoordinator(
-            PersistentNotificationController persistentNotificationController,
             TrustedWebActivityDisclosureController disclosureController,
             TrustedWebActivityToolbarController toolbarController,
             TrustedWebActivityToolbarView toolbarView,
             TrustedWebActivityDisclosureView disclosureView,
-            PersistentNotificationView notificationView,
             TrustedWebActivityOpenTimeRecorder openTimeRecorder,
             TrustedWebActivityVerifier verifier,
             CloseButtonNavigator closeButtonNavigator) {

chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/view/TrustedWebActivityDisclosureView.java

@@ -85,7 +85,7 @@ public class TrustedWebActivityDisclosureView implements
         int type = Snackbar.TYPE_PERSISTENT;
         int code = Snackbar.UMA_TWA_PRIVACY_DISCLOSURE;
 
-        String action = mResources.getString(R.string.ok_got_it);
+        String action = mResources.getString(R.string.ok);
         return Snackbar.make(title, mSnackbarController, type, code)
                 .setAction(action, null)
                 .setSingleLine(false);

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

@@ -773,7 +773,6 @@ public class CustomTabIntentDataProvider extends BrowserSessionDataProvider {
     boolean isTrustedWebActivity() {
         if (!ChromeFeatureList.isInitialized()) return false;
         if (!ChromeFeatureList.isEnabled(ChromeFeatureList.TRUSTED_WEB_ACTIVITY)) return false;
-        if (ChromeVersionInfo.isBetaBuild() || ChromeVersionInfo.isStableBuild()) return false;
 
         return mIsTrustedWebActivity;
     }