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

Unified Diff: content/renderer/pepper/event_conversion_unittest.cc

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/event_conversion.cc ('k') | content/renderer/pepper/host_array_buffer_var.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/event_conversion_unittest.cc
diff --git a/content/renderer/pepper/event_conversion_unittest.cc b/content/renderer/pepper/event_conversion_unittest.cc
index 93fe1132ffcb0b7441e87641ca74b926b6e487da..fcefd1b76899c301e6883ec64bdf5a7c1427d4a4 100644
--- a/content/renderer/pepper/event_conversion_unittest.cc
+++ b/content/renderer/pepper/event_conversion_unittest.cc
@@ -2,12 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/renderer/pepper/event_conversion.h"
+
#include <stddef.h>
+#include <memory>
+
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
#include "content/common/input/synthetic_web_input_event_builders.h"
-#include "content/renderer/pepper/event_conversion.h"
#include "ppapi/shared_impl/ppb_input_event_shared.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -53,7 +55,8 @@ TEST_F(EventConversionTest, TouchStart) {
ASSERT_EQ(1U, pp_event.changed_touches.size());
ASSERT_EQ(1U, pp_event.target_touches.size());
- scoped_ptr<blink::WebInputEvent> event_out(CreateWebInputEvent(pp_event));
+ std::unique_ptr<blink::WebInputEvent> event_out(
+ CreateWebInputEvent(pp_event));
const blink::WebTouchEvent* touch_out =
static_cast<const blink::WebTouchEvent*>(event_out.get());
ASSERT_TRUE(touch_out);
@@ -80,7 +83,8 @@ TEST_F(EventConversionTest, TouchMove) {
ASSERT_EQ(1U, pp_event.changed_touches.size());
ASSERT_EQ(2U, pp_event.target_touches.size());
- scoped_ptr<blink::WebInputEvent> event_out(CreateWebInputEvent(pp_event));
+ std::unique_ptr<blink::WebInputEvent> event_out(
+ CreateWebInputEvent(pp_event));
const blink::WebTouchEvent* touch_out =
static_cast<const blink::WebTouchEvent*>(event_out.get());
ASSERT_TRUE(touch_out);
@@ -107,7 +111,8 @@ TEST_F(EventConversionTest, TouchEnd) {
ASSERT_EQ(1U, pp_event.changed_touches.size());
ASSERT_EQ(2U, pp_event.target_touches.size());
- scoped_ptr<blink::WebInputEvent> event_out(CreateWebInputEvent(pp_event));
+ std::unique_ptr<blink::WebInputEvent> event_out(
+ CreateWebInputEvent(pp_event));
const blink::WebTouchEvent* touch_out =
static_cast<const blink::WebTouchEvent*>(event_out.get());
ASSERT_TRUE(touch_out);
@@ -135,7 +140,8 @@ TEST_F(EventConversionTest, TouchCancel) {
ASSERT_EQ(2U, pp_event.changed_touches.size());
ASSERT_EQ(2U, pp_event.target_touches.size());
- scoped_ptr<blink::WebInputEvent> event_out(CreateWebInputEvent(pp_event));
+ std::unique_ptr<blink::WebInputEvent> event_out(
+ CreateWebInputEvent(pp_event));
const blink::WebTouchEvent* touch_out =
static_cast<const blink::WebTouchEvent*>(event_out.get());
ASSERT_TRUE(touch_out);
« no previous file with comments | « content/renderer/pepper/event_conversion.cc ('k') | content/renderer/pepper/host_array_buffer_var.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698