Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Side by Side Diff: content/browser/renderer_host/web_input_event_aura_unittest.cc

Issue 885463002: Disable WebInputEventAuraTest.TestMakeWebKeyboardEventWindowsKeyCode under TSan. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/web_input_event_aura.h" 5 #include "content/browser/renderer_host/web_input_event_aura.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/events/event.h" 9 #include "ui/events/event.h"
10 #include "ui/events/keycodes/dom3/dom_code.h" 10 #include "ui/events/keycodes/dom3/dom_code.h"
(...skipping 27 matching lines...) Expand all
38 xev.InitKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL, ControlMask); 38 xev.InitKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_CONTROL, ControlMask);
39 ui::KeyEvent event(xev); 39 ui::KeyEvent event(xev);
40 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event); 40 blink::WebKeyboardEvent webkit_event = MakeWebKeyboardEvent(event);
41 // However, modifier bit for Control in |webkit_event| shouldn't be set. 41 // However, modifier bit for Control in |webkit_event| shouldn't be set.
42 EXPECT_EQ(webkit_event.modifiers, 0); 42 EXPECT_EQ(webkit_event.modifiers, 0);
43 } 43 }
44 #endif 44 #endif
45 } 45 }
46 46
47 // Checks that MakeWebKeyboardEvent returns a correct windowsKeyCode. 47 // Checks that MakeWebKeyboardEvent returns a correct windowsKeyCode.
48 #if defined(THREAD_SANITIZER) 48 #if defined(OS_CHROMEOS) || defined(THREAD_SANITIZER)
49 // This test fails under ThreadSanitizer on Linux, see 49 // Fails on Chrome OS and under ThreadSanitizer on Linux, see
50 // https://crbug.com/449103. 50 // https://crbug.com/449103.
51 #define MAYBE_TestMakeWebKeyboardEventWindowsKeyCode \ 51 #define MAYBE_TestMakeWebKeyboardEventWindowsKeyCode \
52 DISABLED_TestMakeWebKeyboardEventWindowsKeyCode 52 DISABLED_TestMakeWebKeyboardEventWindowsKeyCode
53 #else 53 #else
54 #define MAYBE_TestMakeWebKeyboardEventWindowsKeyCode \ 54 #define MAYBE_TestMakeWebKeyboardEventWindowsKeyCode \
55 TestMakeWebKeyboardEventWindowsKeyCode 55 TestMakeWebKeyboardEventWindowsKeyCode
56 #endif 56 #endif
57 TEST(WebInputEventAuraTest, MAYBE_TestMakeWebKeyboardEventWindowsKeyCode) { 57 TEST(WebInputEventAuraTest, MAYBE_TestMakeWebKeyboardEventWindowsKeyCode) {
58 #if defined(USE_X11) 58 #if defined(USE_X11)
59 ui::ScopedXI2Event xev; 59 ui::ScopedXI2Event xev;
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 (webkit_event.modifiers & blink::WebInputEvent::IsKeyPad) != 0) 166 (webkit_event.modifiers & blink::WebInputEvent::IsKeyPad) != 0)
167 << "Failed in " << i << "th test case: " 167 << "Failed in " << i << "th test case: "
168 << "{ui_keycode:" << test_case.ui_keycode 168 << "{ui_keycode:" << test_case.ui_keycode
169 << ", x_keycode:" << test_case.x_keycode 169 << ", x_keycode:" << test_case.x_keycode
170 << "}, expect: " << test_case.expected_result; 170 << "}, expect: " << test_case.expected_result;
171 } 171 }
172 #endif 172 #endif
173 } 173 }
174 174
175 } // namespace content 175 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698