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

Side by Side Diff: chrome/browser/chromeos/events/keyboard_driven_event_rewriter_unittest.cc

Issue 655413002: Convert ARRAYSIZE_UNSAFE -> arraysize in chrome/browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" 10 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 70
71 { ui::VKEY_DOWN, ui::EF_NONE }, 71 { ui::VKEY_DOWN, ui::EF_NONE },
72 { ui::VKEY_DOWN, ui::EF_CONTROL_DOWN }, 72 { ui::VKEY_DOWN, ui::EF_CONTROL_DOWN },
73 { ui::VKEY_DOWN, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN }, 73 { ui::VKEY_DOWN, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN },
74 74
75 { ui::VKEY_RETURN, ui::EF_NONE }, 75 { ui::VKEY_RETURN, ui::EF_NONE },
76 { ui::VKEY_RETURN, ui::EF_CONTROL_DOWN }, 76 { ui::VKEY_RETURN, ui::EF_CONTROL_DOWN },
77 { ui::VKEY_RETURN, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN }, 77 { ui::VKEY_RETURN, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN },
78 }; 78 };
79 79
80 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTests); ++i) { 80 for (size_t i = 0; i < arraysize(kTests); ++i) {
81 EXPECT_EQ(GetExpectedResultAsString(kTests[i].ui_flags, 81 EXPECT_EQ(GetExpectedResultAsString(kTests[i].ui_flags,
82 ui::EVENT_REWRITE_CONTINUE), 82 ui::EVENT_REWRITE_CONTINUE),
83 GetRewrittenEventAsString(kTests[i].ui_keycode, 83 GetRewrittenEventAsString(kTests[i].ui_keycode,
84 kTests[i].ui_flags, 84 kTests[i].ui_flags,
85 ui::ET_KEY_PRESSED)) 85 ui::ET_KEY_PRESSED))
86 << "Test case " << i; 86 << "Test case " << i;
87 } 87 }
88 } 88 }
89 89
90 TEST_F(KeyboardDrivenEventRewriterTest, Rewrite) { 90 TEST_F(KeyboardDrivenEventRewriterTest, Rewrite) {
91 const int kModifierMask = ui::EF_SHIFT_DOWN; 91 const int kModifierMask = ui::EF_SHIFT_DOWN;
92 92
93 struct { 93 struct {
94 ui::KeyboardCode ui_keycode; 94 ui::KeyboardCode ui_keycode;
95 int ui_flags; 95 int ui_flags;
96 } kTests[] = { 96 } kTests[] = {
97 { ui::VKEY_LEFT, kModifierMask }, 97 { ui::VKEY_LEFT, kModifierMask },
98 { ui::VKEY_RIGHT, kModifierMask }, 98 { ui::VKEY_RIGHT, kModifierMask },
99 { ui::VKEY_UP, kModifierMask }, 99 { ui::VKEY_UP, kModifierMask },
100 { ui::VKEY_DOWN, kModifierMask }, 100 { ui::VKEY_DOWN, kModifierMask },
101 { ui::VKEY_RETURN, kModifierMask }, 101 { ui::VKEY_RETURN, kModifierMask },
102 { ui::VKEY_F6, kModifierMask }, 102 { ui::VKEY_F6, kModifierMask },
103 }; 103 };
104 104
105 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTests); ++i) { 105 for (size_t i = 0; i < arraysize(kTests); ++i) {
106 EXPECT_EQ(GetExpectedResultAsString(ui::EF_NONE, 106 EXPECT_EQ(GetExpectedResultAsString(ui::EF_NONE,
107 ui::EVENT_REWRITE_REWRITTEN), 107 ui::EVENT_REWRITE_REWRITTEN),
108 GetRewrittenEventAsString(kTests[i].ui_keycode, 108 GetRewrittenEventAsString(kTests[i].ui_keycode,
109 kTests[i].ui_flags, 109 kTests[i].ui_flags,
110 ui::ET_KEY_PRESSED)) 110 ui::ET_KEY_PRESSED))
111 << "Test case " << i; 111 << "Test case " << i;
112 } 112 }
113 } 113 }
114 114
115 } // namespace chromeos 115 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698