Deflake Mac views_unittest's MenuRunnerCocoaTest.RunMenuAndCancel

ui/events/base_event_utils.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/base_event_utils.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_switches.h"
 
+bool g_no_mock_time = false;
+
 namespace ui {
 
 namespace {
 
 #if defined(OS_CHROMEOS)
 const int kSystemKeyModifierMask = EF_ALT_DOWN | EF_COMMAND_DOWN;
 #else
 const int kSystemKeyModifierMask = EF_ALT_DOWN;
 #endif  // defined(OS_CHROMEOS)
 
@@ skipping 15 matching lines @@
   // AltGr modifier is used to type alternative keys on certain keyboard layouts
   // so we don't consider keys with the AltGr modifier as a system key.
   return (kSystemKeyModifierMask & flags) != 0 &&
          (EF_ALTGR_DOWN & flags) == 0;
 }
 
 base::LazyInstance<std::unique_ptr<base::TickClock>>::Leaky g_tick_clock =
     LAZY_INSTANCE_INITIALIZER;
 
 base::TimeTicks EventTimeForNow() {
+  if (g_no_mock_time)
+    DCHECK(!g_tick_clock.Get());

[tapted, 2016/06/30 07:02:49]

So I got this to fail at [ RUN      ] MenuRunnerCocoaTest.RunMenuAndCancel
[9380:1287:0626/225619:5850751330859:FATAL:base_event_utils.cc(54)] Check
failed: !g_tick_clock.Get(). 
0   views_unittests                     0x000000010bf179f3
_ZN4base5debug10StackTraceC1Ev + 19
1   views_unittests                     0x000000010bf3b3d7
_ZN7logging10LogMessageD2Ev + 71
2   views_unittests                     0x000000010c64b7b6
_ZN2ui15EventTimeForNowEv + 166
3   views_unittests                     0x000000010bd70413
_ZN5views4test41MenuRunnerCocoaTest_RunMenuAndCancel_Test8TestBodyEv + 35
4   views_unittests                     0x000000010d80496a
_ZN7testing4Test3RunEv + 474
5   views_unittests                     0x000000010d80555a
_ZN7testing8TestInfo3RunEv + 410
6   views_unittests                     0x000000010d805be3
_ZN7testing8TestCase3RunEv + 451
7   views_unittests                     0x000000010d80cfa9
_ZN7testing8internal12UnitTestImpl11RunAllTestsEv + 825
8   views_unittests                     0x000000010d80cc3d
_ZN7testing8UnitTest3RunEv + 269
9   views_unittests                     0x000000010c016f1f
_ZN4base9TestSuite3RunEv + 127
10  views_unittests                     0x000000010c02dd39
_ZN4base15LaunchUnitTestsEiPPcRKNS_8CallbackIFivELNS_8internal8CopyModeE1EEE +
137
11  views_unittests                     0x000000010c692c0e
_ZN5views14ViewsTestSuite8RunTestsEv + 110
12  views_unittests                     0x000000010be4cbd9 main + 41
13  views_unittests                     0x000000010bcbf0b4 start + 52
14  ???                                 0x0000000000000007 0x0 + 7

before it passed on a retry. So that confirms the test is picking up global
state when it shouldn't. Then it also allowed me to verify whether having the
EventGenerator destructor undo the stuff it does is enough to avoid the problem
(it did! \o/)

   return g_tick_clock.Get() ? g_tick_clock.Get()->NowTicks()
                             : base::TimeTicks::Now();
 }
 
 void SetEventTickClockForTesting(std::unique_ptr<base::TickClock> tick_clock) {
+  DCHECK(!g_no_mock_time);
   g_tick_clock.Get() = std::move(tick_clock);
 }
 
 double EventTimeStampToSeconds(base::TimeTicks time_stamp) {
   return (time_stamp - base::TimeTicks()).InSecondsF();
 }
 
 base::TimeTicks EventTimeStampFromSeconds(double time_stamp_seconds) {
   return base::TimeTicks() + base::TimeDelta::FromSecondsD(time_stamp_seconds);
 }
 
 }  // namespace ui