[WebApks] Tweak logic for 'bouncing back to chrome'

[WebApks] Tweak logic for 'bouncing back to chrome'

Previously a reload of a page inside a WebApk can erroneously redirect
back to Chrome (see bug for further details). Unfortunately, due to the
display logic of WebApks, we can't rely on startActivity doing the right
thing because Android can't tell that the MainActivity for the shell apk
is just a 'bouncer' to chrome's WebApkActivity. Add a necessary short-circuit.
BUG=604262
Committed: https://crrev.com/6d8738f516886add11bb0661c0f8e21ac4c4e637
Cr-Commit-Position: refs/heads/master@{#410788}

[Yaron, 2016-08-09 17:51:51]

The CQ bit was checked by yfriedman@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-08-09 17:52:30]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[Yaron, 2016-08-09 17:55:03]

yfriedman@chromium.org changed reviewers:
+ mariakhomenko@chromium.org, pkotwicz@chromium.org

[Yaron, 2016-08-09 17:55:04]

both ptal, thanks :)

https://codereview.chromium.org/2225893004/diff/1/chrome/android/javatests/sr...
File
chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java
(left):

https://codereview.chromium.org/2225893004/diff/1/chrome/android/javatests/sr...
chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.java:933:
.withReferrer(WEBAPK_SCOPE)
without my change in the app, removing this would cause
OVERRIDE_WITH_EXTERNAL_INTENT which I think was the wrong behaviour. Regardless
of the referer, if we are in webapk and the url targets a webapk, there should
be no override.

[Maria, 2016-08-09 18:02:57]

lgtm

[commit-bot: I haz the power, 2016-08-09 18:36:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-09 18:36:50]

Dry run: This issue passed the CQ dry run.

[pkotwicz, 2016-08-09 19:34:12]

LGTM

[Yaron, 2016-08-09 20:07:49]

The CQ bit was checked by yfriedman@chromium.org

[commit-bot: I haz the power, 2016-08-09 20:08:18]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-09 20:12:34]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-08-09 20:15:25]

Description was changed from

==========
[WebApks] Tweak logic for 'bouncing back to chrome'

Previously a reload of a page inside a WebApk can erroneously redirect
back to Chrome (see bug for further details). Unfortunately, due to the
display logic of WebApks, we can't rely on startActivity doing the right
thing because Android can't tell that the MainActivity for the shell apk
is just a 'bouncer' to chrome's WebApkActivity. Add a necessary short-circuit.
BUG=604262
==========

to

==========
[WebApks] Tweak logic for 'bouncing back to chrome'

Previously a reload of a page inside a WebApk can erroneously redirect
back to Chrome (see bug for further details). Unfortunately, due to the
display logic of WebApks, we can't rely on startActivity doing the right
thing because Android can't tell that the MainActivity for the shell apk
is just a 'bouncer' to chrome's WebApkActivity. Add a necessary short-circuit.
BUG=604262

Committed: https://crrev.com/6d8738f516886add11bb0661c0f8e21ac4c4e637
Cr-Commit-Position: refs/heads/master@{#410788}
==========

[commit-bot: I haz the power, 2016-08-09 20:15:26]

Patchset 1 (id:??) landed as
https://crrev.com/6d8738f516886add11bb0661c0f8e21ac4c4e637
Cr-Commit-Position: refs/heads/master@{#410788}