From 9fd4ab64bd402859ccea0c5213b0a478f9d6ae5a Mon Sep 17 00:00:00 2001 From: dcheng Date: Tue, 8 Mar 2016 15:17:29 -0800 Subject: Change scoped_ptr to a type alias for std::unique_ptr on OS_WIN This also removes the infinite recursion part of the ReferenceCycle test. While it's nice not to crash like this, [unique.ptr.single.dtor] doesn't actually require ~unique_ptr to reset the stored pointer to nullptr on destruction. Thus, infinite recursion, while not useful, is allowed per the spec. BUG=554298,579269 Review URL: https://codereview.chromium.org/1763983002 Cr-Commit-Position: refs/heads/master@{#379962} --- remoting/host/input_injector_win.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'remoting/host') diff --git a/remoting/host/input_injector_win.cc b/remoting/host/input_injector_win.cc index 396b46b..d1fefa9 100644 --- a/remoting/host/input_injector_win.cc +++ b/remoting/host/input_injector_win.cc @@ -362,7 +362,7 @@ scoped_ptr InputInjector::Create( // static bool InputInjector::SupportsTouchEvents() { - return TouchInjectorWinDelegate::Create(); + return TouchInjectorWinDelegate::Create() != nullptr; } } // namespace remoting -- cgit v1.1