Commit ba982e82 authored by Finnur Thorarinsson's avatar Finnur Thorarinsson Committed by Commit Bot

[Android]: Switch to loadNativeLibraryAndInitBrowserProcess.

It is a much simpler and easier way to load native in the
PWA Install test for IPH.

Bug: 1135551
Change-Id: I4d20f9ac5a4cfd1cdc00f81bae713c4b514c54d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2489902Reviewed-by: default avatarTommy Nyquist <nyquist@chromium.org>
Commit-Queue: Finnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819385}
parent 47e06393
...@@ -66,9 +66,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; ...@@ -66,9 +66,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.infobar.InfoBarContainer; import org.chromium.chrome.browser.infobar.InfoBarContainer;
import org.chromium.chrome.browser.infobar.InstallableAmbientBadgeInfoBar; import org.chromium.chrome.browser.infobar.InstallableAmbientBadgeInfoBar;
import org.chromium.chrome.browser.init.BrowserParts;
import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
import org.chromium.chrome.browser.init.EmptyBrowserParts;
import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab.TabUtils; import org.chromium.chrome.browser.tab.TabUtils;
...@@ -88,7 +85,10 @@ import org.chromium.components.feature_engagement.FeatureConstants; ...@@ -88,7 +85,10 @@ import org.chromium.components.feature_engagement.FeatureConstants;
import org.chromium.components.infobars.InfoBar; import org.chromium.components.infobars.InfoBar;
import org.chromium.components.infobars.InfoBarAnimationListener; import org.chromium.components.infobars.InfoBarAnimationListener;
import org.chromium.components.infobars.InfoBarUiItem; import org.chromium.components.infobars.InfoBarUiItem;
import org.chromium.components.signin.AccountManagerFacadeProvider;
import org.chromium.components.signin.test.util.FakeAccountManagerFacade;
import org.chromium.content_public.browser.UiThreadTaskTraits; import org.chromium.content_public.browser.UiThreadTaskTraits;
import org.chromium.content_public.browser.test.NativeLibraryTestUtils;
import org.chromium.content_public.browser.test.util.Criteria; import org.chromium.content_public.browser.test.util.Criteria;
import org.chromium.content_public.browser.test.util.CriteriaHelper; import org.chromium.content_public.browser.test.util.CriteriaHelper;
import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.content_public.browser.test.util.TestThreadUtils;
...@@ -101,7 +101,6 @@ import org.chromium.ui.modelutil.PropertyModel; ...@@ -101,7 +101,6 @@ import org.chromium.ui.modelutil.PropertyModel;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
/** /**
* Tests the app banners. * Tests the app banners.
...@@ -235,7 +234,8 @@ public class AppBannerManagerTest { ...@@ -235,7 +234,8 @@ public class AppBannerManagerTest {
} }
}; };
loadNative(); AccountManagerFacadeProvider.setInstanceForTests(new FakeAccountManagerFacade(null));
NativeLibraryTestUtils.loadNativeLibraryAndInitBrowserProcess();
ThreadUtils.runOnUiThreadBlocking(() -> { ThreadUtils.runOnUiThreadBlocking(() -> {
Profile profile = Profile.getLastUsedRegularProfile(); Profile profile = Profile.getLastUsedRegularProfile();
...@@ -262,22 +262,6 @@ public class AppBannerManagerTest { ...@@ -262,22 +262,6 @@ public class AppBannerManagerTest {
} }
} }
private void loadNative() {
final AtomicBoolean mNativeLoaded = new AtomicBoolean();
final BrowserParts parts = new EmptyBrowserParts() {
@Override
public void finishNativeInitialization() {
mNativeLoaded.set(true);
}
};
PostTask.postTask(UiThreadTaskTraits.DEFAULT, () -> {
ChromeBrowserInitializer.getInstance().handlePreNativeStartup(parts);
ChromeBrowserInitializer.getInstance().handlePostNativeStartup(true, parts);
});
CriteriaHelper.pollUiThread(
() -> mNativeLoaded.get(), "Failed while waiting for starting native.");
}
private void resetEngagementForUrl(final String url, final double engagement) { private void resetEngagementForUrl(final String url, final double engagement) {
ThreadUtils.runOnUiThreadBlocking(() -> { ThreadUtils.runOnUiThreadBlocking(() -> {
// TODO (https://crbug.com/1063807): Add incognito mode tests. // TODO (https://crbug.com/1063807): Add incognito mode tests.
......
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