content/renderer/mus/compositor_mus_connection_unittest.cc - Issue 1917053003: unique_ptr_migration: clean up references to scoped_ptr as of r389721

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/mus/compositor_mus_connection_unittest.cc

Issue 1917053003: unique_ptr_migration: clean up references to scoped_ptr as of r389721 (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

« content/browser/renderer_host/browser_compositor_view_mac.h ('K') | « content/browser/service_worker/service_worker_context_core_unittest.cc ('k') | content/test/test_navigation_url_loader_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/mus/compositor_mus_connection_unittest.cc

diff --git a/content/renderer/mus/compositor_mus_connection_unittest.cc b/content/renderer/mus/compositor_mus_connection_unittest.cc

index 3820ab5641da481c6d9aa862aa139edca32ed86b..437afc8580518d7851ca272244685f61bfb32939 100644

--- a/content/renderer/mus/compositor_mus_connection_unittest.cc

+++ b/content/renderer/mus/compositor_mus_connection_unittest.cc

@@ -8,7 +8,6 @@

#include "base/macros.h"

#include "base/memory/ref_counted.h"

-#include "base/memory/scoped_ptr.h"

#include "base/test/test_simple_task_runner.h"

#include "base/time/time.h"

#include "components/mus/public/cpp/tests/test_window.h"

@@ -469,7 +468,7 @@ TEST_F(CompositorMusConnectionTest, TouchEventConsumed) {

gfx::Point(), ui::EF_NONE, 0, ui::EventTimeForNow());

scoped_refptr<TestCallback> test_callback(new TestCallback);

- scoped_ptr<base::Callback<void(EventResult)>> ack_callback(

+ std::unique_ptr<base::Callback<void(EventResult)>> ack_callback(

dcheng 2016/04/26 08:16:55 No need to add <memory> since it's already include

new base::Callback<void(EventResult)>(

base::Bind(&::TestCallback::ResultCallback, test_callback)));