Commit a0d9c96a authored by Peter E Conn's avatar Peter E Conn Committed by Commit Bot

📎 Rename TrustedWebActivityVerifier to Verifier.

Bug: 1017114
Change-Id: I072639120d59897cd81818944f865772019833dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879297Reviewed-by: default avatarMichael van Ouwerkerk <mvanouwerkerk@chromium.org>
Commit-Queue: Peter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709477}
parent 495e3645
......@@ -168,9 +168,9 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityBrowserControlsVisibilityManager.java",
"java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityDisclosureController.java",
"java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityOpenTimeRecorder.java",
"java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityVerifier.java",
"java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TwaRegistrar.java",
"java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TwaVerifierDelegate.java",
"java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/Verifier.java",
"java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/VerifierDelegate.java",
"java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/sharing/TwaSharingController.java",
"java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/splashscreen/SplashImageHolder.java",
......
......@@ -33,7 +33,7 @@ chrome_junit_test_java_sources = [
"junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TestVerifierDelegate.java",
"junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityDisclosureControllerTest.java",
"junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityOpenTimeRecorderTest.java",
"junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/TrustedWebActivityVerifierTest.java",
"junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/VerifierTest.java",
"junit/src/org/chromium/chrome/browser/compositor/CompositorSurfaceManagerImplTest.java",
"junit/src/org/chromium/chrome/browser/compositor/animation/CompositorAnimationHandlerTest.java",
"junit/src/org/chromium/chrome/browser/compositor/animation/CompositorAnimatorTest.java",
......
......@@ -8,8 +8,8 @@ import org.chromium.chrome.browser.browserservices.TrustedWebActivityUmaRecorder
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityBrowserControlsVisibilityManager;
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.TrustedWebActivityVerifier;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityVerifier.VerificationStatus;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.Verifier;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.Verifier.VerificationStatus;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.splashscreen.TwaSplashController;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.view.TrustedWebActivityDisclosureView;
import org.chromium.chrome.browser.customtabs.CustomTabIntentDataProvider;
......@@ -31,7 +31,7 @@ import dagger.Lazy;
@ActivityScope
public class TrustedWebActivityCoordinator implements InflationObserver {
private final TrustedWebActivityVerifier mVerifier;
private final Verifier mVerifier;
private TrustedWebActivityBrowserControlsVisibilityManager mBrowserControlsVisibilityManager;
private final CustomTabStatusBarColorProvider mStatusBarColorProvider;
private final Lazy<ImmersiveModeController> mImmersiveModeController;
......@@ -43,7 +43,7 @@ public class TrustedWebActivityCoordinator implements InflationObserver {
TrustedWebActivityDisclosureController disclosureController,
TrustedWebActivityDisclosureView disclosureView,
TrustedWebActivityOpenTimeRecorder openTimeRecorder,
TrustedWebActivityVerifier verifier,
Verifier verifier,
CustomTabActivityNavigationController navigationController,
Lazy<TwaSplashController> splashController,
CustomTabIntentDataProvider intentDataProvider,
......@@ -96,7 +96,7 @@ public class TrustedWebActivityCoordinator implements InflationObserver {
}
private void onVerificationUpdate() {
TrustedWebActivityVerifier.VerificationState state = mVerifier.getState();
Verifier.VerificationState state = mVerifier.getState();
boolean inTwaMode = state == null || state.status != VerificationStatus.FAILURE;
if (inTwaMode == mInTwaMode) return;
mInTwaMode = inTwaMode;
......
......@@ -31,7 +31,7 @@ import javax.inject.Named;
* - Transforming the origin into a domain (requires native).
*
* Lifecycle: There should be a 1-1 relationship between this class and
* {@link TrustedWebActivityVerifier}. Having more instances won't effect correctness, but will
* {@link Verifier}. Having more instances won't effect correctness, but will
* limit the performance benefits of the cache.
* Thread safety: All methods on this class should be called from the same thread.
*/
......
......@@ -12,8 +12,8 @@ import static org.chromium.chrome.browser.browserservices.trustedwebactivityui.T
import org.chromium.chrome.browser.browserservices.TrustedWebActivityUmaRecorder;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.TrustedWebActivityModel;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityVerifier.VerificationState;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityVerifier.VerificationStatus;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.Verifier.VerificationState;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.Verifier.VerificationStatus;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import org.chromium.chrome.browser.lifecycle.NativeInitObserver;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
......@@ -28,7 +28,7 @@ public class TrustedWebActivityDisclosureController implements NativeInitObserve
TrustedWebActivityModel.DisclosureEventsCallback {
private final ChromePreferenceManager mPreferenceManager;
private final TrustedWebActivityModel mModel;
private final TrustedWebActivityVerifier mVerifier;
private final Verifier mVerifier;
private final TrustedWebActivityUmaRecorder mRecorder;
@Inject
......@@ -36,7 +36,7 @@ public class TrustedWebActivityDisclosureController implements NativeInitObserve
ChromePreferenceManager preferenceManager,
TrustedWebActivityModel model,
ActivityLifecycleDispatcher lifecycleDispatcher,
TrustedWebActivityVerifier verifier,
Verifier verifier,
TrustedWebActivityUmaRecorder recorder) {
mVerifier = verifier;
mPreferenceManager = preferenceManager;
......
......@@ -8,8 +8,8 @@ import android.os.SystemClock;
import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.browserservices.TrustedWebActivityUmaRecorder;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityVerifier.VerificationState;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityVerifier.VerificationStatus;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.Verifier.VerificationState;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.Verifier.VerificationStatus;
import org.chromium.chrome.browser.dependency_injection.ActivityScope;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver;
......@@ -21,7 +21,7 @@ import javax.inject.Inject;
*/
@ActivityScope
public class TrustedWebActivityOpenTimeRecorder implements PauseResumeWithNativeObserver {
private final TrustedWebActivityVerifier mVerifier;
private final Verifier mVerifier;
private final TrustedWebActivityUmaRecorder mRecorder;
private final ActivityTabProvider mTabProvider;
......@@ -34,7 +34,7 @@ public class TrustedWebActivityOpenTimeRecorder implements PauseResumeWithNative
@Inject
TrustedWebActivityOpenTimeRecorder(
ActivityLifecycleDispatcher lifecycleDispatcher,
TrustedWebActivityVerifier verifier,
Verifier verifier,
TrustedWebActivityUmaRecorder recorder,
ActivityTabProvider provider) {
mVerifier = verifier;
......
......@@ -25,7 +25,7 @@ import javax.inject.Inject;
import androidx.browser.customtabs.CustomTabsService;
/**
* Provides Trusted Web Activity specific behaviour for the {@link TrustedWebActivityVerifier}.
* Provides Trusted Web Activity specific behaviour for the {@link Verifier}.
*/
public class TwaVerifierDelegate implements VerifierDelegate, Destroyable, NativeInitObserver,
SaveInstanceStateObserver {
......
......@@ -41,7 +41,7 @@ import androidx.annotation.Nullable;
* TODO(peconn): Make this class work with both Origins and Scopes (for WebAPK unificiation).
*/
@ActivityScope
public class TrustedWebActivityVerifier implements NativeInitObserver {
public class Verifier implements NativeInitObserver {
private final CustomTabActivityTabProvider mTabProvider;
private final TabObserverRegistrar mTabObserverRegistrar;
private final BrowserServicesIntentDataProvider mIntentDataProvider;
......@@ -101,7 +101,7 @@ public class TrustedWebActivityVerifier implements NativeInitObserver {
};
@Inject
public TrustedWebActivityVerifier(
public Verifier(
ActivityLifecycleDispatcher lifecycleDispatcher,
TabObserverRegistrar tabObserverRegistrar,
CustomTabActivityTabProvider tabProvider,
......
......@@ -8,7 +8,7 @@ import org.chromium.base.Promise;
import org.chromium.chrome.browser.browserservices.Origin;
/**
* A Delegate for the {@link TrustedWebActivityVerifier} that provides implementation specific to
* A Delegate for the {@link Verifier} that provides implementation specific to
* Trusted Web Activities, WebAPKs or A2HS as appropriate.
*/
public interface VerifierDelegate {
......
......@@ -11,7 +11,7 @@ import android.util.Pair;
import org.chromium.base.Promise;
import org.chromium.chrome.browser.browserservices.TrustedWebActivityUmaRecorder;
import org.chromium.chrome.browser.browserservices.TrustedWebActivityUmaRecorder.ShareRequestMethod;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityVerifier;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.Verifier;
import org.chromium.chrome.browser.customtabs.CustomTabIntentDataProvider;
import org.chromium.chrome.browser.customtabs.content.CustomTabActivityNavigationController;
import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvider;
......@@ -36,14 +36,14 @@ public class TwaSharingController {
private final CustomTabActivityTabProvider mTabProvider;
private final CustomTabActivityNavigationController mNavigationController;
private final WebApkPostShareTargetNavigator mPostNavigator;
private final TrustedWebActivityVerifier mVerifier;
private final Verifier mVerifier;
private final TrustedWebActivityUmaRecorder mUmaRecorder;
@Inject
public TwaSharingController(CustomTabActivityTabProvider tabProvider,
CustomTabActivityNavigationController navigationController,
WebApkPostShareTargetNavigator postNavigator,
TrustedWebActivityVerifier verifier,
Verifier verifier,
TrustedWebActivityUmaRecorder umaRecorder) {
mTabProvider = tabProvider;
mNavigationController = navigationController;
......
......@@ -29,8 +29,8 @@ import org.chromium.base.test.util.Feature;
import org.chromium.chrome.browser.browserservices.Origin;
import org.chromium.chrome.browser.browserservices.TrustedWebActivityUmaRecorder;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.TrustedWebActivityModel;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityVerifier.VerificationState;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityVerifier.VerificationStatus;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.Verifier.VerificationState;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.Verifier.VerificationStatus;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
......@@ -45,7 +45,7 @@ public class TrustedWebActivityDisclosureControllerTest {
@Mock public ChromePreferenceManager mPreferences;
@Mock public ActivityLifecycleDispatcher mLifecycleDispatcher;
@Mock public TrustedWebActivityVerifier mVerifier;
@Mock public Verifier mVerifier;
@Mock public TrustedWebActivityUmaRecorder mRecorder;
@Captor public ArgumentCaptor<Runnable> mVerificationObserverCaptor;
......
......@@ -27,8 +27,8 @@ import org.chromium.base.test.BaseRobolectricTestRunner;
import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.browserservices.Origin;
import org.chromium.chrome.browser.browserservices.TrustedWebActivityUmaRecorder;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityVerifier.VerificationState;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityVerifier.VerificationStatus;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.Verifier.VerificationState;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.Verifier.VerificationStatus;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
import java.util.concurrent.TimeUnit;
......@@ -41,7 +41,7 @@ import java.util.concurrent.TimeUnit;
public class TrustedWebActivityOpenTimeRecorderTest {
@Mock ActivityLifecycleDispatcher mLifecycleDispatcher;
@Mock TrustedWebActivityVerifier mVerifier;
@Mock Verifier mVerifier;
@Mock TrustedWebActivityUmaRecorder mUmaRecorder;
@Mock ActivityTabProvider mTabProvider;
@Captor ArgumentCaptor<Runnable> mVerificationObserverCaptor;
......
......@@ -24,7 +24,7 @@ import org.robolectric.annotation.Config;
import org.chromium.base.test.BaseRobolectricTestRunner;
import org.chromium.chrome.browser.ChromeFeatureList;
import org.chromium.chrome.browser.browserservices.Origin;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.TrustedWebActivityVerifier.VerificationStatus;
import org.chromium.chrome.browser.browserservices.trustedwebactivityui.controller.Verifier.VerificationStatus;
import org.chromium.chrome.browser.customtabs.CustomTabIntentDataProvider;
import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvider;
import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher;
......@@ -45,7 +45,7 @@ import java.util.Collections;
@Config(manifest = Config.NONE)
@EnableFeatures(ChromeFeatureList.TRUSTED_WEB_ACTIVITY)
@DisableFeatures(ChromeFeatureList.TRUSTED_WEB_ACTIVITY_POST_MESSAGE)
public class TrustedWebActivityVerifierTest {
public class VerifierTest {
private static final Origin TRUSTED_ORIGIN = new Origin("https://www.origin1.com/");
private static final Origin OTHER_TRUSTED_ORIGIN = new Origin("https://www.origin2.com/");
......@@ -70,7 +70,7 @@ public class TrustedWebActivityVerifierTest {
TestVerifierDelegate mVerifierDelegate = new TestVerifierDelegate(PACKAGE_NAME);
private TrustedWebActivityVerifier mVerifier;
private Verifier mVerifier;
@Before
public void setUp() {
......@@ -79,7 +79,7 @@ public class TrustedWebActivityVerifierTest {
doNothing().when(mTabObserverRegistrar).registerTabObserver(mTabObserverCaptor.capture());
when(mIntentDataProvider.getTrustedWebActivityAdditionalOrigins())
.thenReturn(Collections.singletonList("https://www.origin2.com/"));
mVerifier = new TrustedWebActivityVerifier(mLifecycleDispatcher, mTabObserverRegistrar,
mVerifier = new Verifier(mLifecycleDispatcher, mTabObserverRegistrar,
mTabProvider, mIntentDataProvider, mVerifierDelegate, mTwaRegistrar);
// TODO(peconn): Add check on permission updated being updated.
}
......@@ -190,7 +190,7 @@ public class TrustedWebActivityVerifierTest {
assertStatus(VerificationStatus.SUCCESS);
}
private void assertStatus(@TrustedWebActivityVerifier.VerificationStatus int status) {
private void assertStatus(@Verifier.VerificationStatus int status) {
assertEquals(status, mVerifier.getState().status);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment