Commit 3de38eca authored by Peter Kotwicz's avatar Peter Kotwicz Committed by Commit Bot

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: default avatarPeter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715169}
parent 4ae9e6e5
...@@ -95,7 +95,7 @@ public class CurrentPageVerifier implements NativeInitObserver { ...@@ -95,7 +95,7 @@ public class CurrentPageVerifier implements NativeInitObserver {
mIntentDataProvider = intentDataProvider; mIntentDataProvider = intentDataProvider;
mDelegate = delegate; mDelegate = delegate;
tabObserverRegistrar.registerTabObserver(mVerifyOnPageLoadObserver); tabObserverRegistrar.registerActivityTabObserver(mVerifyOnPageLoadObserver);
tabProvider.addObserver(mVerifyOnTabSwitchObserver); tabProvider.addObserver(mVerifyOnTabSwitchObserver);
lifecycleDispatcher.register(this); lifecycleDispatcher.register(this);
} }
......
...@@ -74,7 +74,9 @@ public class CurrentPageVerifierTest { ...@@ -74,7 +74,9 @@ public class CurrentPageVerifierTest {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
when(mTabProvider.getTab()).thenReturn(mTab); when(mTabProvider.getTab()).thenReturn(mTab);
when(mClientPackageNameProvider.get()).thenReturn(PACKAGE_NAME); when(mClientPackageNameProvider.get()).thenReturn(PACKAGE_NAME);
doNothing().when(mTabObserverRegistrar).registerTabObserver(mTabObserverCaptor.capture()); doNothing()
.when(mTabObserverRegistrar)
.registerActivityTabObserver(mTabObserverCaptor.capture());
when(mIntentDataProvider.getTrustedWebActivityAdditionalOrigins()) when(mIntentDataProvider.getTrustedWebActivityAdditionalOrigins())
.thenReturn(Collections.singletonList("https://www.origin2.com/")); .thenReturn(Collections.singletonList("https://www.origin2.com/"));
mCurrentPageVerifier = new CurrentPageVerifier(mLifecycleDispatcher, mTabObserverRegistrar, mCurrentPageVerifier = new CurrentPageVerifier(mLifecycleDispatcher, mTabObserverRegistrar,
......
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