commit cab03384b0268ced093e29aeb5d9e1ae5b84ec0b
author Luis Hector Chavez <lhchavez@google.com> Wed Jun 01 21:58:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 01 21:58:03 2016 +0000
tree af7dc88960c2784a0629d59472aec68edd8a1c33
parent 23ea9097910795586d28d3ea343b2782d4423b17
parent 416bf6a2cda35bc11206c2bc28309dc902a6b9f4

Merge "core: Update libchrome APIs to r395517"
am: 51814a0142

* commit '51814a0142f3d49d6bed42aa149898866db99153':
  core: Update libchrome APIs to r395517

Change-Id: Ib038b956891b61afb5af199e4ec5f5342a59802a

libbinderwrapper/real_binder_wrapper.h

diff --git a/libbinderwrapper/real_binder_wrapper.h b/libbinderwrapper/real_binder_wrapper.h
index 1675432..fa05383 100644
--- a/libbinderwrapper/real_binder_wrapper.h
+++ b/libbinderwrapper/real_binder_wrapper.h
@@ -17,6 +17,8 @@
 #ifndef SYSTEM_CORE_LIBBINDERWRAPPER_REAL_BINDER_WRAPPER_H_
 #define SYSTEM_CORE_LIBBINDERWRAPPER_REAL_BINDER_WRAPPER_H_
 
+#include <map>
+
 #include <base/macros.h>
 #include <binderwrapper/binder_wrapper.h>
 

metricsd/uploader/metrics_log_base.cc

diff --git a/metricsd/uploader/metrics_log_base.cc b/metricsd/uploader/metrics_log_base.cc
index 1a60b4f..f23bd63 100644
--- a/metricsd/uploader/metrics_log_base.cc
+++ b/metricsd/uploader/metrics_log_base.cc
@@ -16,6 +16,8 @@
 
 #include "uploader/metrics_log_base.h"
 
+#include <memory>
+
 #include "base/build_time.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
@@ -125,7 +127,7 @@
   histogram_proto->set_name_hash(Hash(histogram_name));
   histogram_proto->set_sum(snapshot.sum());
 
-  for (scoped_ptr<SampleCountIterator> it = snapshot.Iterator(); !it->Done();
+  for (std::unique_ptr<SampleCountIterator> it = snapshot.Iterator(); !it->Done();
        it->Next()) {
     HistogramBase::Sample min;
     HistogramBase::Sample max;