Felix, can you please take a look?

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/d71abed75b07b4b9fc50591cbeb2b6c8874bf448

commit d71abed75b07b4b9fc50591cbeb2b6c8874bf448
Author: pkotwicz <pkotwicz@chromium.org>
Date: Thu Apr 27 16:40:32 2017

[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}

[modify] https://crrev.com/d71abed75b07b4b9fc50591cbeb2b6c8874bf448/chrome/android/webapk/libs/client/BUILD.gn
[modify] https://crrev.com/d71abed75b07b4b9fc50591cbeb2b6c8874bf448/chrome/android/webapk/shell_apk/BUILD.gn
[modify] https://crrev.com/d71abed75b07b4b9fc50591cbeb2b6c8874bf448/chrome/android/webapk/shell_apk/shell_apk_version.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/da877aa6097d48a901ef697e62f9796089c57d3a

commit da877aa6097d48a901ef697e62f9796089c57d3a
Author: zpeng <zpeng@chromium.org>
Date: Thu Apr 27 20:45:02 2017

Add PRESUBMIT script to enforce WebAPK shell apk version update

This CL adds PRESUBMIT script to chrome/android/webapk/shell_apk so
that any time code in chrome/android/webapk/shell_apk/ changes,
chrome/android/webapk/shell_apk/shell_apk_version.gni must be updated
accordingly. See comments in presubmit.py for detailed rules.

BUG= 708053 

Review-Url: https://codereview.chromium.org/2830343002
Cr-Commit-Position: refs/heads/master@{#467779}

[add] https://crrev.com/da877aa6097d48a901ef697e62f9796089c57d3a/chrome/android/webapk/shell_apk/PRESUBMIT.py

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/db08d35eab5d639a6ed751dd4e42dcd5b4f683ec

commit db08d35eab5d639a6ed751dd4e42dcd5b4f683ec
Author: timvolodine <timvolodine@chromium.org>
Date: Fri Apr 28 12:22:41 2017

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}

[modify] https://crrev.com/db08d35eab5d639a6ed751dd4e42dcd5b4f683ec/chrome/android/webapk/libs/client/BUILD.gn
[modify] https://crrev.com/db08d35eab5d639a6ed751dd4e42dcd5b4f683ec/chrome/android/webapk/shell_apk/BUILD.gn
[modify] https://crrev.com/db08d35eab5d639a6ed751dd4e42dcd5b4f683ec/chrome/android/webapk/shell_apk/shell_apk_version.gni

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/ce7ea8b13892b4b9564f3c8af96ebccc24f4d0fb

commit ce7ea8b13892b4b9564f3c8af96ebccc24f4d0fb
Author: pkotwicz <pkotwicz@chromium.org>
Date: Fri Apr 28 18:49:41 2017

Reland of [WebAPKs] Make WebAPK update flow more sensible (patchset #2 id:90001 of https://codereview.chromium.org/2845943006/ )

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

Original issue's description:
> 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

TBR=hartmanng@chromium.org,hanxi@chromium.org,zpeng@chromium.org,dominickn@chromium.org,timvolodine@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/2847263002
Cr-Commit-Position: refs/heads/master@{#468075}

[modify] https://crrev.com/ce7ea8b13892b4b9564f3c8af96ebccc24f4d0fb/chrome/android/webapk/libs/client/BUILD.gn
[modify] https://crrev.com/ce7ea8b13892b4b9564f3c8af96ebccc24f4d0fb/chrome/android/webapk/shell_apk/BUILD.gn
[modify] https://crrev.com/ce7ea8b13892b4b9564f3c8af96ebccc24f4d0fb/chrome/android/webapk/shell_apk/shell_apk_version.gni