Commit 0fa3741d authored by Haiyang Pan's avatar Haiyang Pan Committed by Commit Bot

Revert "Add logging to external intent handling"

This reverts commit ba58fd11.

Reason for revert: Three tests org.chromium.components.external_intents.RedirectHandlerTest#testNavigation* start being flaky in several android builders since this CL: https://test-results.appspot.com/dashboards/flakiness_dashboard.html#testType=network_service_out_of_process_chrome_public_test_apk&tests=org.chromium.components.external_intents.RedirectHandlerTest
And cause quite a few CQ retries: https://analysis.chromium.org/p/chromium/flake-portal/flakes/occurrences?key=ag9zfmZpbmRpdC1mb3ItbWVykQELEgVGbGFrZSKFAWNocm9taXVtQGNocm9tZV9wdWJsaWNfdGVzdF9hcGtAb3JnLmNocm9taXVtLmNvbXBvbmVudHMuZXh0ZXJuYWxfaW50ZW50cy5SZWRpcmVjdEhhbmRsZXJUZXN0I3Rlc3ROYXZpZ2F0aW9uRnJvbUxpbmtXaXRob3V0VXNlckdlc3R1cmUM

TBR=jochen@chromium.org, tedchoc@chromium.org

Change-Id: I7155b0ed534e0f3b4a5e712d6f9ac4685c50d7cb
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2250936
Commit-Queue: Haiyang Pan <hypan@google.com>
Reviewed-by: default avatarHaiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#779567}
parent b1d0fc82
...@@ -70,8 +70,7 @@ public class ExternalNavigationHandler { ...@@ -70,8 +70,7 @@ public class ExternalNavigationHandler {
private static final String TAG = "UrlHandler"; private static final String TAG = "UrlHandler";
// Enables debug logging on a local build. // Enables debug logging on a local build.
// TODO(jochen): switch this back to false. private static final boolean DEBUG = false;
private static final boolean DEBUG = true;
private static final String WTAI_URL_PREFIX = "wtai://wp/"; private static final String WTAI_URL_PREFIX = "wtai://wp/";
private static final String WTAI_MC_URL_PREFIX = "wtai://wp/mc;"; private static final String WTAI_MC_URL_PREFIX = "wtai://wp/mc;";
......
...@@ -13,7 +13,6 @@ import android.text.TextUtils; ...@@ -13,7 +13,6 @@ import android.text.TextUtils;
import org.chromium.base.ContextUtils; import org.chromium.base.ContextUtils;
import org.chromium.base.IntentUtils; import org.chromium.base.IntentUtils;
import org.chromium.base.Log;
import org.chromium.base.PackageManagerUtils; import org.chromium.base.PackageManagerUtils;
import org.chromium.ui.base.PageTransition; import org.chromium.ui.base.PageTransition;
...@@ -24,7 +23,6 @@ import java.util.List; ...@@ -24,7 +23,6 @@ import java.util.List;
* This class contains the logic to determine effective navigation/redirect. * This class contains the logic to determine effective navigation/redirect.
*/ */
public class RedirectHandler { public class RedirectHandler {
private static final String TAG = "RedirectHandler";
/** /**
* An invalid entry index. * An invalid entry index.
*/ */
...@@ -150,30 +148,15 @@ public class RedirectHandler { ...@@ -150,30 +148,15 @@ public class RedirectHandler {
boolean isNewLoadingStartedByUser = false; boolean isNewLoadingStartedByUser = false;
boolean isFromIntent = pageTransitionCore == PageTransition.LINK boolean isFromIntent = pageTransitionCore == PageTransition.LINK
&& (pageTransType & PageTransition.FROM_API) != 0; && (pageTransType & PageTransition.FROM_API) != 0;
Log.i(TAG,
"updateNewUrlLoading called (pageTransType: " + pageTransType
+ ", isRedirect: " + isRedirect + ", hasUserGesture: " + hasUserGesture
+ ", lastUserInteractionTime: " + lastUserInteractionTime
+ ", lastCommittedEntryIndex: " + lastCommittedEntryIndex + ")");
Log.i(TAG,
" - prevNewUrlLoadingTime: " + prevNewUrlLoadingTime
+ ", mLastNewUrlLoadingTime: " + mLastNewUrlLoadingTime);
Log.i(TAG,
" - pageTransitionCore: " + pageTransitionCore + ", isFromIntent: " + isFromIntent);
if (!isRedirect) { if (!isRedirect) {
if ((pageTransType & PageTransition.FORWARD_BACK) != 0) { if ((pageTransType & PageTransition.FORWARD_BACK) != 0) {
isNewLoadingStartedByUser = true; isNewLoadingStartedByUser = true;
Log.i(TAG, "- isNewLoadingStartedByUser: forward/back navigation");
} else if (pageTransitionCore != PageTransition.LINK } else if (pageTransitionCore != PageTransition.LINK
&& pageTransitionCore != PageTransition.FORM_SUBMIT) { && pageTransitionCore != PageTransition.FORM_SUBMIT) {
isNewLoadingStartedByUser = true; isNewLoadingStartedByUser = true;
Log.i(TAG, "- isNewLoadingStartedByUser: not a link or form submission");
} else if (prevNewUrlLoadingTime == INVALID_TIME || isFromIntent } else if (prevNewUrlLoadingTime == INVALID_TIME || isFromIntent
|| lastUserInteractionTime > prevNewUrlLoadingTime) { || lastUserInteractionTime > prevNewUrlLoadingTime) {
isNewLoadingStartedByUser = true; isNewLoadingStartedByUser = true;
Log.i(TAG,
"- isNewLoadingStartedByUser: first load, from intent or new user gesture");
} }
} }
...@@ -181,22 +164,17 @@ public class RedirectHandler { ...@@ -181,22 +164,17 @@ public class RedirectHandler {
// Updates mInitialNavigationType for a new loading started by a user's gesture. // Updates mInitialNavigationType for a new loading started by a user's gesture.
if (isFromIntent && mInitialIntent != null) { if (isFromIntent && mInitialIntent != null) {
mInitialNavigationType = NAVIGATION_TYPE_FROM_INTENT; mInitialNavigationType = NAVIGATION_TYPE_FROM_INTENT;
Log.i(TAG, " - mInitialNavigationType: FROM_INTENT");
} else { } else {
clearIntentHistory(); clearIntentHistory();
if (pageTransitionCore == PageTransition.TYPED) { if (pageTransitionCore == PageTransition.TYPED) {
mInitialNavigationType = NAVIGATION_TYPE_FROM_USER_TYPING; mInitialNavigationType = NAVIGATION_TYPE_FROM_USER_TYPING;
Log.i(TAG, " - mInitialNavigationType: USER_TYPING");
} else if (pageTransitionCore == PageTransition.RELOAD } else if (pageTransitionCore == PageTransition.RELOAD
|| (pageTransType & PageTransition.FORWARD_BACK) != 0) { || (pageTransType & PageTransition.FORWARD_BACK) != 0) {
mInitialNavigationType = NAVIGATION_TYPE_FROM_RELOAD; mInitialNavigationType = NAVIGATION_TYPE_FROM_RELOAD;
Log.i(TAG, " - mInitialNavigationType: RELOAD");
} else if (pageTransitionCore == PageTransition.LINK && !hasUserGesture) { } else if (pageTransitionCore == PageTransition.LINK && !hasUserGesture) {
mInitialNavigationType = NAVIGATION_TYPE_FROM_LINK_WITHOUT_USER_GESTURE; mInitialNavigationType = NAVIGATION_TYPE_FROM_LINK_WITHOUT_USER_GESTURE;
Log.i(TAG, " - mInitialNavigationType: LINK_WITHOUT_USER_GESTURE");
} else { } else {
mInitialNavigationType = NAVIGATION_TYPE_OTHER; mInitialNavigationType = NAVIGATION_TYPE_OTHER;
Log.i(TAG, " - mInitialNavigationType: OTHER");
} }
} }
mIsOnEffectiveRedirectChain = false; mIsOnEffectiveRedirectChain = false;
...@@ -205,9 +183,6 @@ public class RedirectHandler { ...@@ -205,9 +183,6 @@ public class RedirectHandler {
} else if (mInitialNavigationType != NAVIGATION_TYPE_NONE) { } else if (mInitialNavigationType != NAVIGATION_TYPE_NONE) {
// Redirect chain starts from the second url loading. // Redirect chain starts from the second url loading.
mIsOnEffectiveRedirectChain = true; mIsOnEffectiveRedirectChain = true;
Log.i(TAG, " - mIsOnEffectiveRedirectChain: true");
} else {
Log.i(TAG, " - no updates");
} }
} }
......
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