GitLab

Commit 0c0fc42d moved
AwVariationsServiceClient's "channel == unknown ? stable : channel"
logic into a new android_webview::GetChannel. But this is confusing
because the new GetChannel retains the variations-specific comment, and
the name "android_webview::GetChannel" might sound like all of WebView
should be using this sanitized channel, when UMA still needs the
un-sanitized channel.

Move the variations-specific comment back into AwVariationsServiceClient
and rename GetChannel to GetChannelOrStable.

BUG=758290

Change-Id: I4590aa22b73424e14e47444c3fdf3abc151bf441
Reviewed-on: https://chromium-review.googlesource.com/1187271Reviewed-by: Bo <boliu@chromium.org>
Commit-Queue: Paul Miller <paulmiller@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585662}