commit cb3c6f3cd0b908e36443d41c2d736b88d742ee1a
author Luis Hector Chavez <lhchavez@google.com> Wed Jun 01 21:50:00 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 01 21:50:03 2016 +0000
tree 11d56a179a9654fd106f988e5b0ea2857e3cb50d
parent fa717c0b47bb1fed04da295eaa580a92bc08c622
parent 0fb335fc21296b2489e03eead682efba55c5690e

Merge "bt: Update libchrome APIs to r395517"

vendor_libs/test_vendor_lib/src/dual_mode_controller.cc

diff --git a/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc b/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
index 867b6e0..75af537 100644
--- a/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
+++ b/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
@@ -18,6 +18,8 @@
 
 #include "vendor_libs/test_vendor_lib/include/dual_mode_controller.h"
 
+#include <memory>
+
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
@@ -608,7 +610,7 @@
   if (!base::ReadFileToString(base::FilePath(file_name), &properties_raw))
     LOG_INFO(LOG_TAG, "Error reading controller properties from file.");
 
-  scoped_ptr<base::Value> properties_value_ptr =
+  std::unique_ptr<base::Value> properties_value_ptr =
       base::JSONReader::Read(properties_raw);
   if (properties_value_ptr.get() == nullptr)
     LOG_INFO(LOG_TAG,

vendor_libs/test_vendor_lib/src/hci_transport.cc

diff --git a/vendor_libs/test_vendor_lib/src/hci_transport.cc b/vendor_libs/test_vendor_lib/src/hci_transport.cc
index 39b51f0..b2c75e2 100644
--- a/vendor_libs/test_vendor_lib/src/hci_transport.cc
+++ b/vendor_libs/test_vendor_lib/src/hci_transport.cc
@@ -21,8 +21,7 @@
 #include "vendor_libs/test_vendor_lib/include/hci_transport.h"
 
 #include "base/bind.h"
-#include "base/logging.h"
-#include "base/thread_task_runner_handle.h"
+#include "base/threading/thread_task_runner_handle.h"
 
 extern "C" {
 #include <sys/socket.h>