| Index: components/arc/intent_helper/page_transition_util.cc
|
| diff --git a/components/arc/intent_helper/page_transition_util.cc b/components/arc/intent_helper/page_transition_util.cc
|
| index ca5acd754667f347c7eb73ac0126576e9ffb6c61..e4cc29db66c7384b24e03646a563637c0a0d6104 100644
|
| --- a/components/arc/intent_helper/page_transition_util.cc
|
| +++ b/components/arc/intent_helper/page_transition_util.cc
|
| @@ -6,15 +6,6 @@
|
|
|
| namespace arc {
|
|
|
| -namespace {
|
| -
|
| -ui::PageTransition MaskOutPageTransition(ui::PageTransition page_transition,
|
| - ui::PageTransition mask) {
|
| - return ui::PageTransitionFromInt(page_transition & ~mask);
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| bool ShouldIgnoreNavigation(ui::PageTransition page_transition,
|
| bool allow_form_submit,
|
| bool allow_client_redirect) {
|
| @@ -46,10 +37,9 @@ bool ShouldIgnoreNavigation(ui::PageTransition page_transition,
|
| return false;
|
| }
|
|
|
| -ui::PageTransition MaskOutPageTransitionForTesting(
|
| - ui::PageTransition page_transition,
|
| - ui::PageTransition mask) {
|
| - return MaskOutPageTransition(page_transition, mask);
|
| +ui::PageTransition MaskOutPageTransition(ui::PageTransition page_transition,
|
| + ui::PageTransition mask) {
|
| + return ui::PageTransitionFromInt(page_transition & ~mask);
|
| }
|
|
|
| } // namespace arc
|
|
|