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

commit 10acbdd534e1aafb98a41722c948f09d084aab26
Author: Gauthier Ambard <gambard@chromium.org>
Date: Thu Nov 30 15:10:26 2017

Disable testBadgedReadingListFeatureShouldShow on device

The test is flaky, disabling it.

Bug:  789943 
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I81cfd1806f98aebfba2596a7fe1bb61d2d368b26
Reviewed-on: https://chromium-review.googlesource.com/800490
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Mark Cogan <marq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#520543}
[modify] https://crrev.com/10acbdd534e1aafb98a41722c948f09d084aab26/ios/chrome/browser/feature_engagement/BUILD.gn
[modify] https://crrev.com/10acbdd534e1aafb98a41722c948f09d084aab26/ios/chrome/browser/feature_engagement/feature_engagement_egtest.mm

I think this could be because the feature engagement tracker is not fully initialized when the tools menu is opened.

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

commit 4ac683f23cfa0f50ac7240b6d675bd901a570607
Author: Gregory Chatzinoff <gchatz@chromium.org>
Date: Fri Dec 01 08:04:36 2017

Fix Flaky Feature Engagement EG test.

This CL fixes the flaky Feature Engagement EG test by ensuring that
the Feature Engagement Tracker is fully initialized before moving on
with the rest of the test. Since the length of timeout necessary to
avoid flake is undetermined, the CL leaves the test marked as FLAKY,
and the success of the fix will be monitored on the FYI bots.

Bug:  789943 
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ieddc7aecb40058e68ebc89b80c67098c7681be34
Reviewed-on: https://chromium-review.googlesource.com/802816
Reviewed-by: edchin <edchin@chromium.org>
Commit-Queue: Gregory Chatzinoff <gchatz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#520888}
[modify] https://crrev.com/4ac683f23cfa0f50ac7240b6d675bd901a570607/ios/chrome/browser/feature_engagement/BUILD.gn
[modify] https://crrev.com/4ac683f23cfa0f50ac7240b6d675bd901a570607/ios/chrome/browser/feature_engagement/feature_engagement_egtest.mm

Please mark as fixed if it is the case.

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

commit 15a3e07ebe45c1365e1c1287e21290c520cafb54
Author: Gregory Chatzinoff <gchatz@chromium.org>
Date: Tue Dec 05 18:52:42 2017

Reenable testBadgedReadingListFeatureShouldShow.

Reenable this test since flake seems to have been fixed on FYI bots.

Bug:  789943 
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I184607d3fc25206409c0786d81583c49a9f8471a
Reviewed-on: https://chromium-review.googlesource.com/807166
Reviewed-by: edchin <edchin@chromium.org>
Commit-Queue: Gregory Chatzinoff <gchatz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521764}
[modify] https://crrev.com/15a3e07ebe45c1365e1c1287e21290c520cafb54/ios/chrome/browser/feature_engagement/feature_engagement_egtest.mm

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

commit 1608326723ad460a320147c2faf0120e0fada08a
Author: Gregory Chatzinoff <gchatz@chromium.org>
Date: Wed Dec 06 02:05:26 2017

Revert "Reenable testBadgedReadingListFeatureShouldShow."

This reverts commit 15a3e07ebe45c1365e1c1287e21290c520cafb54.

Reason for revert: Still failing on bots.

Original change's description:
> Reenable testBadgedReadingListFeatureShouldShow.
> 
> Reenable this test since flake seems to have been fixed on FYI bots.
> 
> Bug:  789943 
> Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
> Change-Id: I184607d3fc25206409c0786d81583c49a9f8471a
> Reviewed-on: https://chromium-review.googlesource.com/807166
> Reviewed-by: edchin <edchin@chromium.org>
> Commit-Queue: Gregory Chatzinoff <gchatz@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#521764}

TBR=edchin@chromium.org,gchatz@chromium.org

Change-Id: Ia4838fc7a683aaeb54eebbf1c4432f0baeb55b09
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug:  789943 
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Reviewed-on: https://chromium-review.googlesource.com/809857
Reviewed-by: Gregory Chatzinoff <gchatz@chromium.org>
Commit-Queue: Gregory Chatzinoff <gchatz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521945}
[modify] https://crrev.com/1608326723ad460a320147c2faf0120e0fada08a/ios/chrome/browser/feature_engagement/feature_engagement_egtest.mm

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

commit 3737b2d9ed5031a6156625b24304e330adbe5238
Author: Gregory Chatzinoff <gchatz@chromium.org>
Date: Wed Dec 06 22:09:16 2017

Reenable FeatureEngagement EGTest.

Reenable the FeatureEngagement testBadgedREadingListFeatureShouldShow
test by increasing the timeout.

Bug:  789943 
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Iace3e1e7c3beb1930ef7c85cc1184ac27665fcff
Reviewed-on: https://chromium-review.googlesource.com/812218
Reviewed-by: edchin <edchin@chromium.org>
Commit-Queue: Gregory Chatzinoff <gchatz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522222}
[modify] https://crrev.com/3737b2d9ed5031a6156625b24304e330adbe5238/ios/chrome/browser/feature_engagement/feature_engagement_egtest.mm

Please mark as fixed if it is the case

We don't know until we see a couple runs. It is trial and error to figure out if timeout is long enough. 

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

commit 42c2cde3641d05f319af7cfe84aeba3648eff5b8
Author: Gregory Chatzinoff <gchatz@chromium.org>
Date: Fri Dec 08 18:24:31 2017

Increase timeout for load of feature engagement tracker.

Increase the timeout of feature engagement tracker load since a test
is flaking due to the delay of the tracker load.

Bug:  789943 
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I5d0039bfc4580252c0c25a273d0f18b045242a0a
Reviewed-on: https://chromium-review.googlesource.com/816048
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Commit-Queue: Gregory Chatzinoff <gchatz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522823}
[modify] https://crrev.com/42c2cde3641d05f319af7cfe84aeba3648eff5b8/ios/chrome/browser/feature_engagement/feature_engagement_egtest.mm

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

commit 89f6450ad4bd3cce2811a05c62e0e3063a0ab80e
Author: Gregory Chatzinoff <gchatz@chromium.org>
Date: Sat Dec 09 01:40:33 2017

Use a Test FeatureEngagementTracker for integration tests.

Since the loading of the real FeatureEngagementTracker is flaky for
the integration tests, this CL replaces it with an in-memory version.
The integration tests will still provide the necessary test coverage,
since the real FeatureEngagementTracker is tested separately.

Bug:  789943 
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: If3670725557096f3e40fb0aff27f3b58afe538a5
Reviewed-on: https://chromium-review.googlesource.com/818184
Reviewed-by: edchin <edchin@chromium.org>
Commit-Queue: Gregory Chatzinoff <gchatz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#522956}
[modify] https://crrev.com/89f6450ad4bd3cce2811a05c62e0e3063a0ab80e/ios/chrome/browser/feature_engagement/BUILD.gn
[modify] https://crrev.com/89f6450ad4bd3cce2811a05c62e0e3063a0ab80e/ios/chrome/browser/feature_engagement/feature_engagement_egtest.mm

[Auto-generated comment by a script] We noticed that this issue is targeted for M-64; it appears the fix may have landed after branch point, meaning a merge might be required. Please confirm if a merge is required here - if so add Merge-Request-64 label, otherwise remove Merge-TBD label. Thanks.

Not going to cherry pick. There were a lot of changes to this file since branch, and we don't get that much benefit from cherry picking, since the test is still running on simulators on 64 beta.