Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1635)

Unified Diff: chrome/browser/chromeos/arc/page_transition_util_unittest.cc

Issue 2363303003: Allow the external protocol dialog to handle FORM_SUBMIT navigation (Closed)
Patch Set: address comment Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/arc/page_transition_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/arc/page_transition_util_unittest.cc
diff --git a/chrome/browser/chromeos/arc/page_transition_util_unittest.cc b/chrome/browser/chromeos/arc/page_transition_util_unittest.cc
index 3abc4af3c6825f81fc8cb965effeb953da1849ad..d5ec71614c82d2e96800329ed14bbdbe85ae64d3 100644
--- a/chrome/browser/chromeos/arc/page_transition_util_unittest.cc
+++ b/chrome/browser/chromeos/arc/page_transition_util_unittest.cc
@@ -11,17 +11,32 @@ namespace arc {
// Tests that ShouldIgnoreNavigation returns false only for
// PAGE_TRANSITION_LINK.
TEST(PageTransitionUtilTest, TestShouldIgnoreNavigationWithCoreTypes) {
- EXPECT_FALSE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_LINK));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_TYPED));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_AUTO_BOOKMARK));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_AUTO_SUBFRAME));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_MANUAL_SUBFRAME));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_GENERATED));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_AUTO_TOPLEVEL));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_FORM_SUBMIT));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_RELOAD));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_KEYWORD));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_KEYWORD_GENERATED));
+ EXPECT_FALSE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_LINK, false));
+ EXPECT_FALSE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_LINK, true));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_TYPED, false));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_TYPED, true));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_AUTO_BOOKMARK, false));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_AUTO_BOOKMARK, true));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_AUTO_SUBFRAME, false));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_AUTO_SUBFRAME, true));
+ EXPECT_TRUE(
+ ShouldIgnoreNavigation(ui::PAGE_TRANSITION_MANUAL_SUBFRAME, false));
+ EXPECT_TRUE(
+ ShouldIgnoreNavigation(ui::PAGE_TRANSITION_MANUAL_SUBFRAME, true));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_GENERATED, false));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_GENERATED, true));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_AUTO_TOPLEVEL, true));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_FORM_SUBMIT, false));
+ EXPECT_FALSE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_FORM_SUBMIT, true));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_RELOAD, false));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_RELOAD, true));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_KEYWORD, false));
+ EXPECT_TRUE(ShouldIgnoreNavigation(ui::PAGE_TRANSITION_KEYWORD, true));
+ EXPECT_TRUE(
+ ShouldIgnoreNavigation(ui::PAGE_TRANSITION_KEYWORD_GENERATED, false));
+ EXPECT_TRUE(
+ ShouldIgnoreNavigation(ui::PAGE_TRANSITION_KEYWORD_GENERATED, true));
static_assert(
ui::PAGE_TRANSITION_KEYWORD_GENERATED == ui::PAGE_TRANSITION_LAST_CORE,
@@ -32,38 +47,66 @@ TEST(PageTransitionUtilTest, TestShouldIgnoreNavigationWithCoreTypes) {
// provided.
TEST(PageTransitionUtilTest, TestShouldIgnoreNavigationWithLinkWithQualifiers) {
// The navigation is triggered by Forward or Back button.
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PageTransitionFromInt(
- ui::PAGE_TRANSITION_LINK | ui::PAGE_TRANSITION_FORWARD_BACK)));
+ EXPECT_TRUE(ShouldIgnoreNavigation(
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_FORWARD_BACK),
+ false));
+ EXPECT_TRUE(ShouldIgnoreNavigation(
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_FORM_SUBMIT |
+ ui::PAGE_TRANSITION_FORWARD_BACK),
+ true));
// The user used the address bar to triger the navigation.
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PageTransitionFromInt(
- ui::PAGE_TRANSITION_LINK | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));
+ EXPECT_TRUE(ShouldIgnoreNavigation(
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_FROM_ADDRESS_BAR),
+ false));
// The user pressed the Home button.
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PageTransitionFromInt(
- ui::PAGE_TRANSITION_LINK | ui::PAGE_TRANSITION_HOME_PAGE)));
+ EXPECT_TRUE(ShouldIgnoreNavigation(
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_HOME_PAGE),
+ false));
// ARC (for example) opened the link in Chrome.
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PageTransitionFromInt(
- ui::PAGE_TRANSITION_LINK | ui::PAGE_TRANSITION_FROM_API)));
+ EXPECT_TRUE(ShouldIgnoreNavigation(
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_FROM_API),
+ false));
// Also tests the case with 2+ qualifiers.
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PageTransitionFromInt(
- ui::PAGE_TRANSITION_LINK | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR |
- ui::PAGE_TRANSITION_CLIENT_REDIRECT)));
+ EXPECT_TRUE(ShouldIgnoreNavigation(
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_LINK |
+ ui::PAGE_TRANSITION_FROM_ADDRESS_BAR |
+ ui::PAGE_TRANSITION_CLIENT_REDIRECT),
+ false));
}
// Just in case, does the same with ui::PAGE_TRANSITION_TYPED.
TEST(PageTransitionUtilTest,
TestShouldIgnoreNavigationWithTypedWithQualifiers) {
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PageTransitionFromInt(
- ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FORWARD_BACK)));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PageTransitionFromInt(
- ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PageTransitionFromInt(
- ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_HOME_PAGE)));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PageTransitionFromInt(
- ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_API)));
- EXPECT_TRUE(ShouldIgnoreNavigation(ui::PageTransitionFromInt(
- ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR |
- ui::PAGE_TRANSITION_CLIENT_REDIRECT)));
+ EXPECT_TRUE(ShouldIgnoreNavigation(
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
+ ui::PAGE_TRANSITION_FORWARD_BACK),
+ false));
+ EXPECT_TRUE(ShouldIgnoreNavigation(
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
+ ui::PAGE_TRANSITION_FORWARD_BACK),
+ true));
+ EXPECT_TRUE(ShouldIgnoreNavigation(
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
+ ui::PAGE_TRANSITION_FROM_ADDRESS_BAR),
+ false));
+ EXPECT_TRUE(ShouldIgnoreNavigation(
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
+ ui::PAGE_TRANSITION_HOME_PAGE),
+ false));
+ EXPECT_TRUE(ShouldIgnoreNavigation(
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
+ ui::PAGE_TRANSITION_FROM_API),
+ false));
+ EXPECT_TRUE(ShouldIgnoreNavigation(
+ ui::PageTransitionFromInt(ui::PAGE_TRANSITION_TYPED |
+ ui::PAGE_TRANSITION_FROM_ADDRESS_BAR |
+ ui::PAGE_TRANSITION_CLIENT_REDIRECT),
+ false));
}
} // namespace arc
« no previous file with comments | « chrome/browser/chromeos/arc/page_transition_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698