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

Side by Side Diff: ui/events/android/motion_event_android_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
« no previous file with comments | « ui/events/android/motion_event_android.h ('k') | ui/events/blink/blink_event_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <android/input.h> 5 #include <android/input.h>
6 #include <stddef.h> 6 #include <stddef.h>
7 7
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/events/android/motion_event_android.h" 10 #include "ui/events/android/motion_event_android.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 pointer_count, 103 pointer_count,
104 0, 104 0,
105 0, 105 0,
106 0, 106 0,
107 0, 107 0,
108 0, 108 0,
109 0, 109 0,
110 p0, 110 p0,
111 p1); 111 p1);
112 112
113 scoped_ptr<MotionEvent> clone = event.Clone(); 113 std::unique_ptr<MotionEvent> clone = event.Clone();
114 EXPECT_EQ(ui::test::ToString(event), ui::test::ToString(*clone)); 114 EXPECT_EQ(ui::test::ToString(event), ui::test::ToString(*clone));
115 } 115 }
116 116
117 TEST(MotionEventAndroidTest, Cancel) { 117 TEST(MotionEventAndroidTest, Cancel) {
118 const int event_time_ms = 5; 118 const int event_time_ms = 5;
119 const int pointer_count = 1; 119 const int pointer_count = 1;
120 MotionEventAndroid::Pointer p0( 120 MotionEventAndroid::Pointer p0(
121 1, 13.7f, -7.13f, 5.3f, 1.2f, 0.1f, 0.2f, kAndroidToolTypeFinger); 121 1, 13.7f, -7.13f, 5.3f, 1.2f, 0.1f, 0.2f, kAndroidToolTypeFinger);
122 MotionEventAndroid::Pointer p1(0, 0, 0, 0, 0, 0, 0, 0); 122 MotionEventAndroid::Pointer p1(0, 0, 0, 0, 0, 0, 0, 0);
123 MotionEventAndroid event(kPixToDip, 123 MotionEventAndroid event(kPixToDip,
124 base::android::AttachCurrentThread(), 124 base::android::AttachCurrentThread(),
125 nullptr, 125 nullptr,
126 event_time_ms, 126 event_time_ms,
127 kAndroidActionDown, 127 kAndroidActionDown,
128 pointer_count, 128 pointer_count,
129 0, 129 0,
130 0, 130 0,
131 0, 131 0,
132 0, 132 0,
133 0, 133 0,
134 0, 134 0,
135 p0, 135 p0,
136 p1); 136 p1);
137 137
138 scoped_ptr<MotionEvent> cancel_event = event.Cancel(); 138 std::unique_ptr<MotionEvent> cancel_event = event.Cancel();
139 EXPECT_EQ(MotionEvent::ACTION_CANCEL, cancel_event->GetAction()); 139 EXPECT_EQ(MotionEvent::ACTION_CANCEL, cancel_event->GetAction());
140 EXPECT_EQ( 140 EXPECT_EQ(
141 base::TimeTicks() + base::TimeDelta::FromMilliseconds(event_time_ms), 141 base::TimeTicks() + base::TimeDelta::FromMilliseconds(event_time_ms),
142 cancel_event->GetEventTime()); 142 cancel_event->GetEventTime());
143 EXPECT_EQ(p0.pos_x_pixels * kPixToDip, cancel_event->GetX(0)); 143 EXPECT_EQ(p0.pos_x_pixels * kPixToDip, cancel_event->GetX(0));
144 EXPECT_EQ(p0.pos_y_pixels * kPixToDip, cancel_event->GetY(0)); 144 EXPECT_EQ(p0.pos_y_pixels * kPixToDip, cancel_event->GetY(0));
145 EXPECT_EQ(static_cast<size_t>(pointer_count), 145 EXPECT_EQ(static_cast<size_t>(pointer_count),
146 cancel_event->GetPointerCount()); 146 cancel_event->GetPointerCount());
147 EXPECT_EQ(0U, cancel_event->GetHistorySize()); 147 EXPECT_EQ(0U, cancel_event->GetHistorySize());
148 } 148 }
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 0, 216 0,
217 0, 217 0,
218 p0, 218 p0,
219 p1); 219 p1);
220 220
221 EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction()); 221 EXPECT_EQ(MotionEvent::ACTION_POINTER_DOWN, event.GetAction());
222 EXPECT_EQ(action_index, event.GetActionIndex()); 222 EXPECT_EQ(action_index, event.GetActionIndex());
223 } 223 }
224 224
225 } // namespace content 225 } // namespace content
OLDNEW
« no previous file with comments | « ui/events/android/motion_event_android.h ('k') | ui/events/blink/blink_event_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698