Make CurrentPageVerifier only observe the active tab

BUG=1020911

Change-Id: Ife359e136de30b71e829bfadb2f35eb7b9968734
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1907714
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715169}

chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/CurrentPageVerifier.java

@@ -95,7 +95,7 @@ public class CurrentPageVerifier implements NativeInitObserver {
         mIntentDataProvider = intentDataProvider;
         mDelegate = delegate;
 
-        tabObserverRegistrar.registerTabObserver(mVerifyOnPageLoadObserver);
+        tabObserverRegistrar.registerActivityTabObserver(mVerifyOnPageLoadObserver);
         tabProvider.addObserver(mVerifyOnTabSwitchObserver);
         lifecycleDispatcher.register(this);
     }

chrome/android/junit/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/controller/CurrentPageVerifierTest.java

@@ -74,7 +74,9 @@ public class CurrentPageVerifierTest {
         MockitoAnnotations.initMocks(this);
         when(mTabProvider.getTab()).thenReturn(mTab);
         when(mClientPackageNameProvider.get()).thenReturn(PACKAGE_NAME);
-        doNothing().when(mTabObserverRegistrar).registerTabObserver(mTabObserverCaptor.capture());
+        doNothing()
+                .when(mTabObserverRegistrar)
+                .registerActivityTabObserver(mTabObserverCaptor.capture());
         when(mIntentDataProvider.getTrustedWebActivityAdditionalOrigins())
                 .thenReturn(Collections.singletonList("https://www.origin2.com/"));
         mCurrentPageVerifier = new CurrentPageVerifier(mLifecycleDispatcher, mTabObserverRegistrar,