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

Side by Side Diff: ui/events/ozone/layout/xkb/xkb_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
6
5 #include <stddef.h> 7 #include <stddef.h>
6 #include <stdint.h> 8 #include <stdint.h>
7 9
8 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ptr_util.h"
9 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/events/event_constants.h" 13 #include "ui/events/event_constants.h"
11 #include "ui/events/keycodes/dom/dom_code.h" 14 #include "ui/events/keycodes/dom/dom_code.h"
12 #include "ui/events/keycodes/dom/dom_key.h" 15 #include "ui/events/keycodes/dom/dom_key.h"
13 #include "ui/events/keycodes/keyboard_code_conversion.h" 16 #include "ui/events/keycodes/keyboard_code_conversion.h"
14 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h" 17 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
15 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
16 18
17 namespace ui { 19 namespace ui {
18 20
19 namespace { 21 namespace {
20 22
21 // This XkbKeyCodeConverter simply uses the numeric value of the DomCode. 23 // This XkbKeyCodeConverter simply uses the numeric value of the DomCode.
22 class VkTestXkbKeyCodeConverter : public XkbKeyCodeConverter { 24 class VkTestXkbKeyCodeConverter : public XkbKeyCodeConverter {
23 public: 25 public:
24 VkTestXkbKeyCodeConverter() { 26 VkTestXkbKeyCodeConverter() {
25 invalid_xkb_keycode_ = static_cast<xkb_keycode_t>(DomCode::NONE); 27 invalid_xkb_keycode_ = static_cast<xkb_keycode_t>(DomCode::NONE);
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 }; 144 };
143 145
144 } // anonymous namespace 146 } // anonymous namespace
145 147
146 class XkbLayoutEngineVkTest : public testing::Test { 148 class XkbLayoutEngineVkTest : public testing::Test {
147 public: 149 public:
148 XkbLayoutEngineVkTest() {} 150 XkbLayoutEngineVkTest() {}
149 ~XkbLayoutEngineVkTest() override {} 151 ~XkbLayoutEngineVkTest() override {}
150 152
151 void SetUp() override { 153 void SetUp() override {
152 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine( 154 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(base::WrapUnique(
153 make_scoped_ptr(new VkTestXkbKeyboardLayoutEngine(keycode_converter_))); 155 new VkTestXkbKeyboardLayoutEngine(keycode_converter_)));
154 layout_engine_ = static_cast<VkTestXkbKeyboardLayoutEngine*>( 156 layout_engine_ = static_cast<VkTestXkbKeyboardLayoutEngine*>(
155 KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()); 157 KeyboardLayoutEngineManager::GetKeyboardLayoutEngine());
156 } 158 }
157 void TearDown() override {} 159 void TearDown() override {}
158 160
159 protected: 161 protected:
160 VkTestXkbKeyCodeConverter keycode_converter_; 162 VkTestXkbKeyCodeConverter keycode_converter_;
161 VkTestXkbKeyboardLayoutEngine* layout_engine_; 163 VkTestXkbKeyboardLayoutEngine* layout_engine_;
162 }; 164 };
163 165
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
893 std::string layout_id; 895 std::string layout_id;
894 std::string layout_variant; 896 std::string layout_variant;
895 XkbKeyboardLayoutEngine::ParseLayoutName(e->layout_name, &layout_id, 897 XkbKeyboardLayoutEngine::ParseLayoutName(e->layout_name, &layout_id,
896 &layout_variant); 898 &layout_variant);
897 EXPECT_EQ(layout_id, e->layout); 899 EXPECT_EQ(layout_id, e->layout);
898 EXPECT_EQ(layout_variant, e->variant); 900 EXPECT_EQ(layout_variant, e->variant);
899 } 901 }
900 } 902 }
901 903
902 } // namespace ui 904 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc ('k') | ui/events/platform/platform_event_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698