Revert of [WebAPKs] Make WebAPK update flow more sensible

Revert of [WebAPKs] Make WebAPK update flow more sensible (patchset #4 id:100001 of https://codereview.chromium.org/2827233006/ )

Reason for revert:
broke official-* bots, see crbug.com/716330

Original issue's description:
> [WebAPKs] Make WebAPK update flow more sensible
> 
> Previously, whenever the shell_apk in shell_apk_version.gni there was a period
> of time during which
> - Chrome tries to update the WebAPK because the "shell_apk" version with which
>   Chrome is compiled with was updated
> - The WebAPK server is unable to fulfill the update request because the new
>   ShellAPK has not yet been uploaded to the WebAPK server
> 
> This CL splits shell_apk_version in shell_apk_version.gni into two variables:
> |template_shell_apk_version| and |expected_shell_apk_version|
> 
> The new flow for updating android/webapk/shell_apk will be:
> 1) Write CL which:
>    - Makes changes to code in android/webapk/shell_apk
>    - Increments |template_shell_apk_version|
>    This will:
>    - Update the template ShellAPK which is built on the official build bot
>    - Trigger an alert that the ShellAPK on the WebAPK Minting Server needs to
>      be updated
>    - Does not affect the "WebAPK update logic".
> 2) Upload new ShellAPK template to the WebAPK Minting Server
>    At this point:
>    - new WebAPK installs will have the updated shell.
>    - Chrome will still not request updates to the new ShellAPK version
> 3) Write CL which:
>    - Increments |expected_shell_apk_version|
>    This will:
>    - cause Chrome to request updates to the new ShellAPK version
> 
> BUG=708053
> 
> Review-Url: https://codereview.chromium.org/2827233006
> Cr-Commit-Position: refs/heads/master@{#467708}
> Committed: https://chromium.googlesource.com/chromium/src/+/d71abed75b07b4b9fc50591cbeb2b6c8874bf448

TBR=hartmanng@chromium.org,hanxi@chromium.org,zpeng@chromium.org,dominickn@chromium.org,pkotwicz@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=708053
Review-Url: https://codereview.chromium.org/2845943006
Cr-Commit-Position: refs/heads/master@{#467966}
Committed: https://chromium.googlesource.com/chromium/src/+/db08d35eab5d639a6ed751dd4e42dcd5b4f683ec

[timvolodine, 2017-04-28 12:13:39]

The CQ bit was checked by timvolodine@chromium.org

[timvolodine, 2017-04-28 12:13:40]

Created Revert of [WebAPKs] Make WebAPK update flow more sensible

[commit-bot: I haz the power, 2017-04-28 12:13:53]

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, 2017-04-28 12:14:11]

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

[commit-bot: I haz the power, 2017-04-28 12:14:12]

Failed to apply patch for chrome/android/webapk/shell_apk/shell_apk_version.gni:
While running git apply --index -3 -p1;
  error: patch failed: chrome/android/webapk/shell_apk/shell_apk_version.gni:3
  Falling back to three-way merge...
  Applied patch to 'chrome/android/webapk/shell_apk/shell_apk_version.gni' with
conflicts.
  U chrome/android/webapk/shell_apk/shell_apk_version.gni

Patch:       chrome/android/webapk/shell_apk/shell_apk_version.gni
Index: chrome/android/webapk/shell_apk/shell_apk_version.gni
diff --git a/chrome/android/webapk/shell_apk/shell_apk_version.gni
b/chrome/android/webapk/shell_apk/shell_apk_version.gni
index
718adb43d499737921568807419375a9898a1d12..46d2071059ad74cfdb0e9b083e92f6651a5bff65
100644
--- a/chrome/android/webapk/shell_apk/shell_apk_version.gni
+++ b/chrome/android/webapk/shell_apk/shell_apk_version.gni
@@ -3,13 +3,5 @@
 # found in the LICENSE file.
 
 # Must be incremented whenever code in //chrome/android/webapk/shell_apk
-# (including AndroidManifest.xml) is updated. This version should be
incremented
-# prior to uploading a new ShellAPK to the WebAPK Minting Server.
-# Does not affect Chrome.apk
-template_shell_apk_version = 3
-
-# The ShellAPK version expected by Chrome. Chrome will try to update the WebAPK
-# if the WebAPK's ShellAPK version is less than |expected_shell_apk_version|.
-# The version should be incremented after a new ShellAPK has been uploaded to
-# the WebAPK Minting Server.
-expected_shell_apk_version = 3
+# (including AndroidManifest.xml) is updated.
+shell_apk_version = 3

[timvolodine, 2017-04-28 12:22:07]

The CQ bit was checked by timvolodine@chromium.org

[commit-bot: I haz the power, 2017-04-28 12:22:23]

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, 2017-04-28 12:22:44]

CQ is committing da patch.

Bot data: {"patchset_id": 90001, "attempt_start_ts": 1493382127889500,
"parent_rev": "50d4cffe6fc36e4852ec2cb77a33e93d7beb5a51", "commit_rev":
"db08d35eab5d639a6ed751dd4e42dcd5b4f683ec"}

[commit-bot: I haz the power, 2017-04-28 12:22:58]

Description was changed from

==========
Revert of [WebAPKs] Make WebAPK update flow more sensible (patchset #4 id:100001
of https://codereview.chromium.org/2827233006/ )

Reason for revert:
broke official-* bots, see crbug.com/716330

Original issue's description:
> [WebAPKs] Make WebAPK update flow more sensible
> 
> Previously, whenever the shell_apk in shell_apk_version.gni there was a period
> of time during which
> - Chrome tries to update the WebAPK because the "shell_apk" version with which
>   Chrome is compiled with was updated
> - The WebAPK server is unable to fulfill the update request because the new
>   ShellAPK has not yet been uploaded to the WebAPK server
> 
> This CL splits shell_apk_version in shell_apk_version.gni into two variables:
> |template_shell_apk_version| and |expected_shell_apk_version|
> 
> The new flow for updating android/webapk/shell_apk will be:
> 1) Write CL which:
>    - Makes changes to code in android/webapk/shell_apk
>    - Increments |template_shell_apk_version|
>    This will:
>    - Update the template ShellAPK which is built on the official build bot
>    - Trigger an alert that the ShellAPK on the WebAPK Minting Server needs to
>      be updated
>    - Does not affect the "WebAPK update logic".
> 2) Upload new ShellAPK template to the WebAPK Minting Server
>    At this point:
>    - new WebAPK installs will have the updated shell.
>    - Chrome will still not request updates to the new ShellAPK version
> 3) Write CL which:
>    - Increments |expected_shell_apk_version|
>    This will:
>    - cause Chrome to request updates to the new ShellAPK version
> 
> BUG=708053
> 
> Review-Url: https://codereview.chromium.org/2827233006
> Cr-Commit-Position: refs/heads/master@{#467708}
> Committed:
https://chromium.googlesource.com/chromium/src/+/d71abed75b07b4b9fc50591cbeb2...

TBR=hartmanng@chromium.org,hanxi@chromium.org,zpeng@chromium.org,dominickn@ch...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=708053
==========

to

==========
Revert of [WebAPKs] Make WebAPK update flow more sensible (patchset #4 id:100001
of https://codereview.chromium.org/2827233006/ )

Reason for revert:
broke official-* bots, see crbug.com/716330

Original issue's description:
> [WebAPKs] Make WebAPK update flow more sensible
> 
> Previously, whenever the shell_apk in shell_apk_version.gni there was a period
> of time during which
> - Chrome tries to update the WebAPK because the "shell_apk" version with which
>   Chrome is compiled with was updated
> - The WebAPK server is unable to fulfill the update request because the new
>   ShellAPK has not yet been uploaded to the WebAPK server
> 
> This CL splits shell_apk_version in shell_apk_version.gni into two variables:
> |template_shell_apk_version| and |expected_shell_apk_version|
> 
> The new flow for updating android/webapk/shell_apk will be:
> 1) Write CL which:
>    - Makes changes to code in android/webapk/shell_apk
>    - Increments |template_shell_apk_version|
>    This will:
>    - Update the template ShellAPK which is built on the official build bot
>    - Trigger an alert that the ShellAPK on the WebAPK Minting Server needs to
>      be updated
>    - Does not affect the "WebAPK update logic".
> 2) Upload new ShellAPK template to the WebAPK Minting Server
>    At this point:
>    - new WebAPK installs will have the updated shell.
>    - Chrome will still not request updates to the new ShellAPK version
> 3) Write CL which:
>    - Increments |expected_shell_apk_version|
>    This will:
>    - cause Chrome to request updates to the new ShellAPK version
> 
> BUG=708053
> 
> Review-Url: https://codereview.chromium.org/2827233006
> Cr-Commit-Position: refs/heads/master@{#467708}
> Committed:
https://chromium.googlesource.com/chromium/src/+/d71abed75b07b4b9fc50591cbeb2...

TBR=hartmanng@chromium.org,hanxi@chromium.org,zpeng@chromium.org,dominickn@ch...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=708053

Review-Url: https://codereview.chromium.org/2845943006
Cr-Commit-Position: refs/heads/master@{#467966}
Committed:
https://chromium.googlesource.com/chromium/src/+/db08d35eab5d639a6ed751dd4e42...
==========

[commit-bot: I haz the power, 2017-04-28 12:23:00]

Committed patchset #2 (id:90001) as
https://chromium.googlesource.com/chromium/src/+/db08d35eab5d639a6ed751dd4e42...

[pkotwicz, 2017-04-28 18:48:13]

A revert of this CL (patchset #2 id:90001) has been created in
https://codereview.chromium.org/2847263002/ by pkotwicz@chromium.org.

The reason for reverting is: Reverting the revert now that
https://chrome-internal-review.googlesource.com/c/363648/ has landed. That CL
should prevent official builder from breaking.