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

commit 81f3b374d223cfb02340ff52b3fe32f9715f4fcd
Author: boliu <boliu@chromium.org>
Date: Tue Aug 09 14:25:10 2016

aw: Add new entry point into webview

Using a static method allows flexibility to create a different Provider
depending on the version of Android.

BUG= 635895 

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

[modify] https://crrev.com/81f3b374d223cfb02340ff52b3fe32f9715f4fcd/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/clank/internal/apps/+/7c1ce2e36d67819c810c24d1ac98686076aa983f

commit 7c1ce2e36d67819c810c24d1ac98686076aa983f
Author: boliu <boliu@chromium.org>
Date: Tue Aug 09 14:25:10 2016

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/clank/internal/apps/+/7c1ce2e36d67819c810c24d1ac98686076aa983f

commit 7c1ce2e36d67819c810c24d1ac98686076aa983f
Author: boliu <boliu@chromium.org>
Date: Tue Aug 09 14:25:10 2016

so after upstreaming, next step here is probably remove the downstream glue copy, and all the extra build logic to decide which copy of glue to use

I *think* that won't depend on sdk roll either. Agree, Michael?

I think basically, replacing //clank/android_webview/glue with //android_webview/glue in GN should make everything just work.

Yeah, should be fine to go ahead there. Also, I'd delete the merge script so that it's obvious to people they don't have to run it any more - if we want it again sometime we can always pull it out of history.

The following revision refers to this bug:
  https://chrome-internal.googlesource.com/clank/internal/apps/+/c050731a9fb0e4f472f051ca7013e00121f63d02

commit c050731a9fb0e4f472f051ca7013e00121f63d02
Author: Bo Liu <boliu@google.com>
Date: Fri Sep 02 23:26:44 2016

I don't think there's anything left to do here until we need to access unpublished apis again.