This bug requires manual review: We are only 7 days from stable.
Please contact the milestone owner if you have questions.
Owners: amineer@(Android), cmasso@(iOS), ketakid@(ChromeOS), govind@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

Approving merge to M61.

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

commit 1515d7e5635f36ea707b22e799ef0673763611de
Author: Vadim Tryshev <vadimt@google.com>
Date: Tue Aug 29 00:46:09 2017

Using canonical way to enable launcher features flags.

This is variations-team-recommended way, and it avoids incorrectly
counting stats from clients disabled via variations but enabled via flag
from being counted as coming from disabled clients.

Bug:  759769 
Change-Id: I4a6f1fdf11a6954deb42d0d98f4fdcd01cc375ee
Reviewed-on: https://chromium-review.googlesource.com/639034
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Commit-Queue: Vadim Tryshev <vadimt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#497961}
[modify] https://crrev.com/1515d7e5635f36ea707b22e799ef0673763611de/chrome/browser/about_flags.cc
[modify] https://crrev.com/1515d7e5635f36ea707b22e799ef0673763611de/tools/metrics/histograms/enums.xml
[modify] https://crrev.com/1515d7e5635f36ea707b22e799ef0673763611de/ui/app_list/app_list_features.cc
[modify] https://crrev.com/1515d7e5635f36ea707b22e799ef0673763611de/ui/app_list/app_list_switches.cc
[modify] https://crrev.com/1515d7e5635f36ea707b22e799ef0673763611de/ui/app_list/app_list_switches.h

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

commit fff3198694129fbf3e8037424194d201a1a2fd3d
Author: Vadim Tryshev <vadimt@google.com>
Date: Tue Aug 29 18:21:17 2017

Using canonical way to enable launcher features flags.

This is variations-team-recommended way, and it avoids incorrectly
counting stats from clients disabled via variations but enabled via flag
from being counted as coming from disabled clients.

TBR=vadimt@google.com

(cherry picked from commit 1515d7e5635f36ea707b22e799ef0673763611de)

Bug:  759769 
Change-Id: I4a6f1fdf11a6954deb42d0d98f4fdcd01cc375ee
Reviewed-on: https://chromium-review.googlesource.com/639034
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Commit-Queue: Vadim Tryshev <vadimt@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#497961}
Reviewed-on: https://chromium-review.googlesource.com/641991
Reviewed-by: Vadim Tryshev <vadimt@chromium.org>
Cr-Commit-Position: refs/branch-heads/3163@{#976}
Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
[modify] https://crrev.com/fff3198694129fbf3e8037424194d201a1a2fd3d/chrome/browser/about_flags.cc
[modify] https://crrev.com/fff3198694129fbf3e8037424194d201a1a2fd3d/tools/metrics/histograms/enums.xml
[modify] https://crrev.com/fff3198694129fbf3e8037424194d201a1a2fd3d/ui/app_list/app_list_features.cc
[modify] https://crrev.com/fff3198694129fbf3e8037424194d201a1a2fd3d/ui/app_list/app_list_switches.cc
[modify] https://crrev.com/fff3198694129fbf3e8037424194d201a1a2fd3d/ui/app_list/app_list_switches.h

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot