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

Side by Side Diff: ui/events/ozone/layout/keyboard_layout_engine_unittest.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "base/memory/ptr_util.h"
5 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
6 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
7 #include "ui/events/event.h" 8 #include "ui/events/event.h"
8 #include "ui/events/event_constants.h" 9 #include "ui/events/event_constants.h"
9 #include "ui/events/event_utils.h" 10 #include "ui/events/event_utils.h"
10 #include "ui/events/keycodes/dom/dom_code.h" 11 #include "ui/events/keycodes/dom/dom_code.h"
11 #include "ui/events/keycodes/dom/dom_key.h" 12 #include "ui/events/keycodes/dom/dom_key.h"
12 #include "ui/events/keycodes/dom/keycode_converter.h" 13 #include "ui/events/keycodes/dom/keycode_converter.h"
13 #include "ui/events/keycodes/keyboard_code_conversion.h" 14 #include "ui/events/keycodes/keyboard_code_conversion.h"
14 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h" 15 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 KeyboardCode output_keycode; 186 KeyboardCode output_keycode;
186 base::char16 output_character; 187 base::char16 output_character;
187 } kTestCases[] = { 188 } kTestCases[] = {
188 {DomCode::US_A, EF_NONE, DomKey::Constant<'a'>::Character, VKEY_A, 'a'}, 189 {DomCode::US_A, EF_NONE, DomKey::Constant<'a'>::Character, VKEY_A, 'a'},
189 {DomCode::US_A, EF_SHIFT_DOWN, DomKey::Constant<'A'>::Character, VKEY_A, 190 {DomCode::US_A, EF_SHIFT_DOWN, DomKey::Constant<'A'>::Character, VKEY_A,
190 'A'}, 191 'A'},
191 {DomCode::US_A, EF_CONTROL_DOWN, DomKey::Constant<'a'>::Character, 192 {DomCode::US_A, EF_CONTROL_DOWN, DomKey::Constant<'a'>::Character,
192 VKEY_A, 1}, 193 VKEY_A, 1},
193 }; 194 };
194 195
195 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr(engine)); 196 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
197 base::WrapUnique(engine));
196 198
197 for (const auto& t : kTestCases) { 199 for (const auto& t : kTestCases) {
198 DomKey dom_key; 200 DomKey dom_key;
199 KeyboardCode keycode; 201 KeyboardCode keycode;
200 SCOPED_TRACE(base::StringPrintf( 202 SCOPED_TRACE(base::StringPrintf(
201 "%s(%s, 0x%X)", name, 203 "%s(%s, 0x%X)", name,
202 KeycodeConverter::DomCodeToCodeString(t.input_dom_code), 204 KeycodeConverter::DomCodeToCodeString(t.input_dom_code),
203 t.input_flags)); 205 t.input_flags));
204 EXPECT_TRUE( 206 EXPECT_TRUE(
205 engine->Lookup(t.input_dom_code, t.input_flags, &dom_key, &keycode)); 207 engine->Lookup(t.input_dom_code, t.input_flags, &dom_key, &keycode));
(...skipping 12 matching lines...) Expand all
218 TestLookup("StubKeyboardLayoutEngine", new StubKeyboardLayoutEngine()); 220 TestLookup("StubKeyboardLayoutEngine", new StubKeyboardLayoutEngine());
219 221
220 XkbEvdevCodes xkb_evdev_code_converter; 222 XkbEvdevCodes xkb_evdev_code_converter;
221 XkbKeyboardLayoutEngine* xkb_engine = 223 XkbKeyboardLayoutEngine* xkb_engine =
222 new XkbKeyboardLayoutEngine(xkb_evdev_code_converter); 224 new XkbKeyboardLayoutEngine(xkb_evdev_code_converter);
223 xkb_engine->SetKeymapFromStringForTest(kUsLayoutXkbKeymap); 225 xkb_engine->SetKeymapFromStringForTest(kUsLayoutXkbKeymap);
224 TestLookup("XkbKeyboardLayoutEngine", xkb_engine); 226 TestLookup("XkbKeyboardLayoutEngine", xkb_engine);
225 } 227 }
226 228
227 } // namespace ui 229 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/ozone/layout/keyboard_layout_engine_manager.cc ('k') | ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698