Commit 94375950 authored by Alice Wang's avatar Alice Wang Committed by Commit Bot

[Android] Modularize incognito_interstial package

This CL modularized the incognito_interstial package with its source
files, resource file and junit tests.

Bug: 1148766
Change-Id: I5ddc9a8734ff6ee7ea39d2701fe096ac39a41816
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2540469Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827838}
parent 6cc4e5d1
...@@ -194,6 +194,7 @@ android_resources("chrome_app_java_resources") { ...@@ -194,6 +194,7 @@ android_resources("chrome_app_java_resources") {
"//chrome/android/webapk/libs/common:splash_resources", "//chrome/android/webapk/libs/common:splash_resources",
"//chrome/app:java_strings_grd", "//chrome/app:java_strings_grd",
"//chrome/browser/feedback/android:java_resources", "//chrome/browser/feedback/android:java_resources",
"//chrome/browser/incognito/interstitial/android:java_resources",
"//chrome/browser/password_check/android:java_resources", "//chrome/browser/password_check/android:java_resources",
"//chrome/browser/ui/android/appmenu:java_resources", "//chrome/browser/ui/android/appmenu:java_resources",
"//chrome/browser/ui/android/default_browser_promo:java_resources", "//chrome/browser/ui/android/default_browser_promo:java_resources",
...@@ -316,6 +317,7 @@ android_library("chrome_java") { ...@@ -316,6 +317,7 @@ android_library("chrome_java") {
"//chrome/browser/image_descriptions:java", "//chrome/browser/image_descriptions:java",
"//chrome/browser/image_editor/public:java", "//chrome/browser/image_editor/public:java",
"//chrome/browser/image_fetcher:java", "//chrome/browser/image_fetcher:java",
"//chrome/browser/incognito/interstitial/android:java",
"//chrome/browser/metrics_settings/android:java", "//chrome/browser/metrics_settings/android:java",
"//chrome/browser/notifications/chime/android:java", "//chrome/browser/notifications/chime/android:java",
"//chrome/browser/offline_pages/android:java", "//chrome/browser/offline_pages/android:java",
...@@ -814,6 +816,7 @@ junit_binary("chrome_junit_tests") { ...@@ -814,6 +816,7 @@ junit_binary("chrome_junit_tests") {
"//chrome/browser/image_descriptions:java", "//chrome/browser/image_descriptions:java",
"//chrome/browser/image_editor/public:java", "//chrome/browser/image_editor/public:java",
"//chrome/browser/image_fetcher:java", "//chrome/browser/image_fetcher:java",
"//chrome/browser/incognito/interstitial/android:junit",
"//chrome/browser/omaha/android:java", "//chrome/browser/omaha/android:java",
"//chrome/browser/performance_hints/android:java", "//chrome/browser/performance_hints/android:java",
"//chrome/browser/policy/android:java", "//chrome/browser/policy/android:java",
...@@ -1031,6 +1034,7 @@ android_library("chrome_test_java") { ...@@ -1031,6 +1034,7 @@ android_library("chrome_test_java") {
"//chrome/browser/fullscreen/android:java", "//chrome/browser/fullscreen/android:java",
"//chrome/browser/image_descriptions:javatests", "//chrome/browser/image_descriptions:javatests",
"//chrome/browser/image_fetcher:java", "//chrome/browser/image_fetcher:java",
"//chrome/browser/incognito/interstitial/android:java",
"//chrome/browser/offline_pages/android:java", "//chrome/browser/offline_pages/android:java",
"//chrome/browser/omaha/android:java", "//chrome/browser/omaha/android:java",
"//chrome/browser/optimization_guide/android:javatests", "//chrome/browser/optimization_guide/android:javatests",
......
...@@ -850,7 +850,6 @@ chrome_java_resources = [ ...@@ -850,7 +850,6 @@ chrome_java_resources = [
"java/res/layout/homepage_editor.xml", "java/res/layout/homepage_editor.xml",
"java/res/layout/horizontal_divider.xml", "java/res/layout/horizontal_divider.xml",
"java/res/layout/incognito_description_layout.xml", "java/res/layout/incognito_description_layout.xml",
"java/res/layout/incognito_interstitial_bottom_sheet_view.xml",
"java/res/layout/incognito_toggle_tabs.xml", "java/res/layout/incognito_toggle_tabs.xml",
"java/res/layout/infobar_control_url_ellipsizer.xml", "java/res/layout/infobar_control_url_ellipsizer.xml",
"java/res/layout/infobar_footer.xml", "java/res/layout/infobar_footer.xml",
......
...@@ -698,11 +698,6 @@ chrome_java_sources = [ ...@@ -698,11 +698,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncher.java", "java/src/org/chromium/chrome/browser/incognito/IncognitoTabLauncher.java",
"java/src/org/chromium/chrome/browser/incognito/IncognitoTabSnapshotController.java", "java/src/org/chromium/chrome/browser/incognito/IncognitoTabSnapshotController.java",
"java/src/org/chromium/chrome/browser/incognito/IncognitoUtils.java", "java/src/org/chromium/chrome/browser/incognito/IncognitoUtils.java",
"java/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialCoordinator.java",
"java/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialDelegate.java",
"java/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialMediator.java",
"java/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialProperties.java",
"java/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialViewBinder.java",
"java/src/org/chromium/chrome/browser/infobar/AutofillCreditCardFillingInfoBar.java", "java/src/org/chromium/chrome/browser/infobar/AutofillCreditCardFillingInfoBar.java",
"java/src/org/chromium/chrome/browser/infobar/AutofillSaveCardInfoBar.java", "java/src/org/chromium/chrome/browser/infobar/AutofillSaveCardInfoBar.java",
"java/src/org/chromium/chrome/browser/infobar/CardDetail.java", "java/src/org/chromium/chrome/browser/infobar/CardDetail.java",
......
...@@ -106,7 +106,6 @@ chrome_junit_test_java_sources = [ ...@@ -106,7 +106,6 @@ chrome_junit_test_java_sources = [
"junit/src/org/chromium/chrome/browser/image_fetcher/InMemoryCachedImageFetcherTest.java", "junit/src/org/chromium/chrome/browser/image_fetcher/InMemoryCachedImageFetcherTest.java",
"junit/src/org/chromium/chrome/browser/image_fetcher/NetworkImageFetcherTest.java", "junit/src/org/chromium/chrome/browser/image_fetcher/NetworkImageFetcherTest.java",
"junit/src/org/chromium/chrome/browser/incognito/IncognitoTabSnapshotControllerTest.java", "junit/src/org/chromium/chrome/browser/incognito/IncognitoTabSnapshotControllerTest.java",
"junit/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialDelegateTest.java",
"junit/src/org/chromium/chrome/browser/infobar/IPHInfoBarSupportTest.java", "junit/src/org/chromium/chrome/browser/infobar/IPHInfoBarSupportTest.java",
"junit/src/org/chromium/chrome/browser/init/AsyncInitTaskRunnerTest.java", "junit/src/org/chromium/chrome/browser/init/AsyncInitTaskRunnerTest.java",
"junit/src/org/chromium/chrome/browser/installedapp/PackageHashTest.java", "junit/src/org/chromium/chrome/browser/installedapp/PackageHashTest.java",
......
...@@ -4,3 +4,4 @@ roagarwal@chromium.org ...@@ -4,3 +4,4 @@ roagarwal@chromium.org
# TEAM: chrome-privacy-core@google.com # TEAM: chrome-privacy-core@google.com
# COMPONENT: Privacy>Incognito # COMPONENT: Privacy>Incognito
# OS: Android
import("//build/config/android/rules.gni")
android_library("java") {
sources = [
"java/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialCoordinator.java",
"java/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialDelegate.java",
"java/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialMediator.java",
"java/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialProperties.java",
"java/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialViewBinder.java",
]
deps = [
":java_resources",
"//base:base_java",
"//chrome/browser/feedback/android:java",
"//chrome/browser/feedback/android:java_resources",
"//chrome/browser/profiles/android:java",
"//chrome/browser/tab:java",
"//chrome/browser/tabmodel:java",
"//third_party/android_deps:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
]
resources_package = "org.chromium.chrome.browser.incognito.interstitial"
}
android_resources("java_resources") {
sources = [ "java/res/layout/incognito_interstitial_bottom_sheet_view.xml" ]
deps = [ "//chrome/browser/ui/android/strings:ui_strings_grd" ]
}
android_library("junit") {
# Skip platform checks since Robolectric depends on requires_android targets.
bypass_platform_checks = true
testonly = true
sources = [ "junit/src/org/chromium/chrome/browser/incognito/interstitial/IncognitoInterstitialDelegateTest.java" ]
deps = [
":java",
"//base:base_junit_test_support",
"//chrome/browser/feedback/android:java",
"//chrome/browser/profiles/android:java",
"//chrome/browser/tab:java",
"//chrome/browser/tabmodel:java",
"//third_party/junit",
"//third_party/mockito:mockito_java",
]
}
...@@ -9,7 +9,6 @@ import android.app.Activity; ...@@ -9,7 +9,6 @@ import android.app.Activity;
import androidx.annotation.MainThread; import androidx.annotation.MainThread;
import org.chromium.base.ThreadUtils; import org.chromium.base.ThreadUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher;
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;
...@@ -71,4 +70,4 @@ public class IncognitoInterstitialDelegate { ...@@ -71,4 +70,4 @@ public class IncognitoInterstitialDelegate {
currentRegularTab.getUrlString(), TabLaunchType.FROM_CHROME_UI); currentRegularTab.getUrlString(), TabLaunchType.FROM_CHROME_UI);
mRegularTabModel.closeTab(currentRegularTab); mRegularTabModel.closeTab(currentRegularTab);
} }
} }
\ No newline at end of file
...@@ -8,7 +8,6 @@ import android.text.style.StyleSpan; ...@@ -8,7 +8,6 @@ import android.text.style.StyleSpan;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import org.chromium.chrome.R;
import org.chromium.ui.modelutil.PropertyKey; import org.chromium.ui.modelutil.PropertyKey;
import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.text.SpanApplier; import org.chromium.ui.text.SpanApplier;
...@@ -56,4 +55,4 @@ class IncognitoInterstitialViewBinder { ...@@ -56,4 +55,4 @@ class IncognitoInterstitialViewBinder {
private static View getLearnMoreView(View view) { private static View getLearnMoreView(View view) {
return view.findViewById(R.id.incognito_interstitial_learn_more); return view.findViewById(R.id.incognito_interstitial_learn_more);
} }
} }
\ No newline at end of file
...@@ -10,8 +10,6 @@ import static org.mockito.Mockito.when; ...@@ -10,8 +10,6 @@ import static org.mockito.Mockito.when;
import android.app.Activity; import android.app.Activity;
import androidx.test.filters.MediumTest;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
...@@ -20,8 +18,7 @@ import org.mockito.Mock; ...@@ -20,8 +18,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.base.test.BaseRobolectricTestRunner;
import org.chromium.chrome.R; import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncher;
import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
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.TabLaunchType; import org.chromium.chrome.browser.tab.TabLaunchType;
...@@ -37,7 +34,7 @@ public class IncognitoInterstitialDelegateTest { ...@@ -37,7 +34,7 @@ public class IncognitoInterstitialDelegateTest {
private static final String sCurrentUrlPage = "dummy_url_string.com"; private static final String sCurrentUrlPage = "dummy_url_string.com";
@Mock @Mock
private HelpAndFeedbackLauncherImpl mHelpAndFeedbackLauncherImplMock; private HelpAndFeedbackLauncher mHelpAndFeedbackLauncherMock;
@Mock @Mock
private Profile mProfileMock; private Profile mProfileMock;
...@@ -65,7 +62,7 @@ public class IncognitoInterstitialDelegateTest { ...@@ -65,7 +62,7 @@ public class IncognitoInterstitialDelegateTest {
Profile.setLastUsedProfileForTesting(mProfileMock); Profile.setLastUsedProfileForTesting(mProfileMock);
mIncognitoInterstitialDelegate = new IncognitoInterstitialDelegate(mActivityMock, mIncognitoInterstitialDelegate = new IncognitoInterstitialDelegate(mActivityMock,
mRegularTabModelMock, mIncognitoTabCreatorMock, mHelpAndFeedbackLauncherImplMock); mRegularTabModelMock, mIncognitoTabCreatorMock, mHelpAndFeedbackLauncherMock);
} }
@After @After
...@@ -76,16 +73,14 @@ public class IncognitoInterstitialDelegateTest { ...@@ -76,16 +73,14 @@ public class IncognitoInterstitialDelegateTest {
private IncognitoInterstitialDelegate mIncognitoInterstitialDelegate; private IncognitoInterstitialDelegate mIncognitoInterstitialDelegate;
@Test @Test
@MediumTest
public void testOpenLearnMorePage() { public void testOpenLearnMorePage() {
mIncognitoInterstitialDelegate.openLearnMorePage(); mIncognitoInterstitialDelegate.openLearnMorePage();
verify(mHelpAndFeedbackLauncherImplMock) verify(mHelpAndFeedbackLauncherMock)
.show(mActivityMock, sIncognitoLearnMoreText, mProfileMock.getPrimaryOTRProfile(), .show(mActivityMock, sIncognitoLearnMoreText, mProfileMock.getPrimaryOTRProfile(),
null); null);
} }
@Test @Test
@MediumTest
public void testOpenCurrentUrlInIncognitoTab() { public void testOpenCurrentUrlInIncognitoTab() {
mIncognitoInterstitialDelegate.openCurrentUrlInIncognitoTab(); mIncognitoInterstitialDelegate.openCurrentUrlInIncognitoTab();
verify(mIncognitoTabCreatorMock).launchUrl(sCurrentUrlPage, TabLaunchType.FROM_CHROME_UI); verify(mIncognitoTabCreatorMock).launchUrl(sCurrentUrlPage, TabLaunchType.FROM_CHROME_UI);
......
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