content/browser/renderer_host/render_widget_host_view_mac_unittest.mm - Issue 2007083002: Validate that ui::Event::time_stamp comes from the same clock as TimeTicks::Now

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

Issue 2007083002: Validate that ui::Event::time_stamp comes from the same clock as TimeTicks::Now (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@453559-use-timeticks-ui-event

Patch Set: Fix macOS test Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm ('k') | ui/chromeos/ui_chromeos.gyp » ('j') | ui/events/base_event_utils.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

index 39efdc4099f8c5afa2a88498a2a02e0cf5b9a9b1..c8cea6ec5300d8898ac70d002f337ad94b66561e 100644

--- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

+++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

@@ -16,6 +16,7 @@

#include "base/run_loop.h"

#include "base/strings/utf_string_conversions.h"

#include "base/test/histogram_tester.h"

+#include "base/test/simple_test_tick_clock.h"

#include "content/browser/browser_thread_impl.h"

#include "content/browser/compositor/test/no_transport_image_transport_factory.h"

#include "content/browser/frame_host/render_widget_host_view_guest.h"

@@ -36,6 +37,7 @@

#include "testing/gtest_mac.h"

#import "third_party/ocmock/OCMock/OCMock.h"

#import "third_party/ocmock/ocmock_extensions.h"

+#include "ui/events/base_event_utils.h"

#include "ui/events/latency_info.h"

#include "ui/events/test/cocoa_test_event_utils.h"

#import "ui/gfx/test/ui_cocoa_test_helper.h"

@@ -225,6 +227,8 @@ gfx::Rect GetExpectedRect(const gfx::Point& origin,

NSEvent* MockScrollWheelEventWithPhase(SEL mockPhaseSelector, int32_t delta) {

CGEventRef cg_event =

CGEventCreateScrollWheelEvent(NULL, kCGScrollEventUnitLine, 1, delta, 0);

+ CGEventTimestamp timestamp = 0;

+ CGEventSetTimestamp(cg_event, timestamp);

NSEvent* event = [NSEvent eventWithCGEvent:cg_event];

CFRelease(cg_event);

method_setImplementation(

@@ -237,7 +241,12 @@ NSEvent* MockScrollWheelEventWithPhase(SEL mockPhaseSelector, int32_t delta) {

class RenderWidgetHostViewMacTest : public RenderViewHostImplTestHarness {

public:

- RenderWidgetHostViewMacTest() : old_rwhv_(NULL), rwhv_mac_(NULL) {}

+ RenderWidgetHostViewMacTest() : old_rwhv_(NULL), rwhv_mac_(NULL) {

+ std::unique_ptr<base::SimpleTestTickClock> mock_clock(

+ new base::SimpleTestTickClock());

+ mock_clock->Advance(base::TimeDelta::FromMilliseconds(100));

sadrul 2016/06/23 16:38:37 What is the purpose of this?

majidvp 2016/06/24 19:40:56 If I recall correctly, there was an assert somewhe

+ ui::SetEventTickClockForTesting(std::move(mock_clock));

+ }

void SetUp() override {

RenderViewHostImplTestHarness::SetUp();