commit 90c4a0d3a66a84270aa8a8b4d46a97e6172074e9
author Luis Hector Chavez <lhchavez@google.com> Sat May 21 06:12:45 2016
committer chrome-bot <chrome-bot@chromium.org> Thu Jun 23 17:37:22 2016
tree 643ebe0b50aab41fcafc91ef9d2df86269fe53ae
parent 3a84e4d300ed4f09dd519c452d8b3d3bd110f442

firewalld: Update libchrome APIs to r395517

The new libchrome has been ported from Chromium and some APIs have
changed. Make necessary changes at call sites.

CQ-DEPEND=CL:346457

Change-Id: I8a9d29713657c2791049de21e98ad15d1ed358ad
(cherry picked from commit c0413cc291345e498ee7d9f8eb478de7fedc8e51)
Reviewed-on: https://chromium-review.googlesource.com/349033
Commit-Ready: Heng-ruey Hsu <henryhsu@google.com>
Tested-by: Heng-ruey Hsu <henryhsu@google.com>
Reviewed-by: Luis Hector Chavez <lhchavez@google.com>
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>

firewall_service.h

diff --git a/firewall_service.h b/firewall_service.h
index 2cf5218..bcfb546 100644
--- a/firewall_service.h
+++ b/firewall_service.h
@@ -15,9 +15,12 @@
 #ifndef FIREWALLD_FIREWALL_SERVICE_H_
 #define FIREWALLD_FIREWALL_SERVICE_H_
 
+#if !defined(__ANDROID__)
+# include <memory>
+#endif  // !__ANDROID__
+
 #include <base/callback.h>
 #include <base/macros.h>
-#include <base/memory/scoped_ptr.h>
 #include <base/memory/weak_ptr.h>
 #include <brillo/dbus/dbus_object.h>
 

include/firewalld/firewall.h

diff --git a/include/firewalld/firewall.h b/include/firewalld/firewall.h
index d61ac2b..04718fa 100644
--- a/include/firewalld/firewall.h
+++ b/include/firewalld/firewall.h
@@ -16,6 +16,8 @@
 #define FIREWALLD_BINDER_CLIENT_FIREWALL_H_
 
 #include <memory>
+#include <string>
+#include <vector>
 
 #include <binderwrapper/binder_wrapper.h>