summaryrefslogtreecommitdiffstats
path: root/remoting/host
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2016-03-08 15:17:29 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-08 23:24:12 +0000
commit9fd4ab64bd402859ccea0c5213b0a478f9d6ae5a (patch)
tree0705bff240c7bcb0ee53845ff45f61812ff372b4 /remoting/host
parent97d372c2bc6233832ee573db666579ea15209430 (diff)
downloadchromium_src-9fd4ab64bd402859ccea0c5213b0a478f9d6ae5a.zip
chromium_src-9fd4ab64bd402859ccea0c5213b0a478f9d6ae5a.tar.gz
chromium_src-9fd4ab64bd402859ccea0c5213b0a478f9d6ae5a.tar.bz2
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}
Diffstat (limited to 'remoting/host')
-rw-r--r--remoting/host/input_injector_win.cc2
1 files changed, 1 insertions, 1 deletions
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> InputInjector::Create(
// static
bool InputInjector::SupportsTouchEvents() {
- return TouchInjectorWinDelegate::Create();
+ return TouchInjectorWinDelegate::Create() != nullptr;
}
} // namespace remoting