commit f1eb895f7ea70ad99bbe60508fda825923c35af6
author Ben Chan <benchan@chromium.org> Fri Dec 09 04:56:04 2016
committer chrome-bot <chrome-bot@chromium.org> Fri Dec 09 22:37:19 2016
tree ec04f2eca79665738f8cf20911178e50af6046f2
parent 6b0aba12a385f4d3a7a47641a3a919018032f6f8

touch_noise_filter: replace scoped_ptr with std::unique_ptr

scoped_ptr from libchrome has been deprecated in favor of C++11
std::unique_ptr.

BUG=chromium:672314
TEST=Run unit tests.

Change-Id: I2a1e0a33794fcf0c0e13edfe36155c4bef21d2dd
Reviewed-on: https://chromium-review.googlesource.com/418478
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

input_event_filter.h

diff --git a/input_event_filter.h b/input_event_filter.h
index bd70210..fd36923 100644
--- a/input_event_filter.h
+++ b/input_event_filter.h
@@ -8,7 +8,7 @@
 #include <linux/input.h>
 #include <stdint.h>
 
-#include <base/memory/scoped_ptr.h>
+#include <memory>
 
 #include "touch_noise_filter/filter.h"
 
@@ -38,7 +38,7 @@
   uint64_t current_touching_;
   uint64_t prev_touching_;
 
-  scoped_ptr<NoiseFilter> filter_;
+  std::unique_ptr<NoiseFilter> filter_;
   size_t current_slot_;
 };
 

mux_filter.h

diff --git a/mux_filter.h b/mux_filter.h
index baaf10c..c1bfc7a 100644
--- a/mux_filter.h
+++ b/mux_filter.h
@@ -7,7 +7,7 @@
 
 #include "touch_noise_filter/filter.h"
 
-#include <base/memory/scoped_ptr.h>
+#include <memory>
 
 namespace touch_noise_filter {
 
@@ -17,7 +17,7 @@
   virtual ~MuxFilter();
   void FilterFrame(Frame* previous, Frame* current, size_t num_slots);
 private:
-  scoped_ptr<NoiseFilter*[]> filters_;
+  std::unique_ptr<NoiseFilter*[]> filters_;
   size_t num_filters_;
 };