firewalld: Rename "chromeos" -> "brillo" in include paths and namespaces
libchromeos is transitioning to libbrillo and chromeos namespaces
and include directory is changing to brillo.
Bug: 24872993
Change-Id: Icc70ef99c10acc983a9c261faaa983e26536ad04
diff --git a/firewall_daemon.cc b/firewall_daemon.cc
index 691dcd2..4c5a037 100644
--- a/firewall_daemon.cc
+++ b/firewall_daemon.cc
@@ -21,8 +21,8 @@
namespace firewalld {
FirewallDaemon::FirewallDaemon()
- : chromeos::DBusServiceDaemon{kFirewallServiceName,
- dbus::ObjectPath{kFirewallServicePath}} {
+ : brillo::DBusServiceDaemon{kFirewallServiceName,
+ dbus::ObjectPath{kFirewallServicePath}} {
}
void FirewallDaemon::RegisterDBusObjectsAsync(AsyncEventSequencer* sequencer) {
diff --git a/firewall_daemon.h b/firewall_daemon.h
index 5183420..d82b79d 100644
--- a/firewall_daemon.h
+++ b/firewall_daemon.h
@@ -16,17 +16,17 @@
#define FIREWALLD_FIREWALL_DAEMON_H_
#include <base/macros.h>
-#include <chromeos/daemons/dbus_daemon.h>
-#include <chromeos/dbus/async_event_sequencer.h>
+#include <brillo/daemons/dbus_daemon.h>
+#include <brillo/dbus/async_event_sequencer.h>
#include "dbus_interface.h"
#include "firewall_service.h"
-using chromeos::dbus_utils::AsyncEventSequencer;
+using brillo::dbus_utils::AsyncEventSequencer;
namespace firewalld {
-class FirewallDaemon : public chromeos::DBusServiceDaemon {
+class FirewallDaemon : public brillo::DBusServiceDaemon {
public:
FirewallDaemon();
diff --git a/firewall_service.cc b/firewall_service.cc
index 2969682..4cf3260 100644
--- a/firewall_service.cc
+++ b/firewall_service.cc
@@ -20,7 +20,7 @@
namespace firewalld {
FirewallService::FirewallService(
- chromeos::dbus_utils::ExportedObjectManager* object_manager)
+ brillo::dbus_utils::ExportedObjectManager* object_manager)
: org::chromium::FirewalldAdaptor(&iptables_),
dbus_object_{object_manager, object_manager->GetBus(),
org::chromium::FirewalldAdaptor::GetObjectPath()} {}
diff --git a/firewall_service.h b/firewall_service.h
index efb3d6b..6d46255 100644
--- a/firewall_service.h
+++ b/firewall_service.h
@@ -19,7 +19,7 @@
#include <base/macros.h>
#include <base/memory/scoped_ptr.h>
#include <base/memory/weak_ptr.h>
-#include <chromeos/dbus/dbus_object.h>
+#include <brillo/dbus/dbus_object.h>
#include "dbus_bindings/org.chromium.Firewalld.h"
#if !defined(__ANDROID__)
@@ -29,14 +29,14 @@
#include "iptables.h"
using CompletionAction =
- chromeos::dbus_utils::AsyncEventSequencer::CompletionAction;
+ brillo::dbus_utils::AsyncEventSequencer::CompletionAction;
namespace firewalld {
class FirewallService : public org::chromium::FirewalldAdaptor {
public:
explicit FirewallService(
- chromeos::dbus_utils::ExportedObjectManager* object_manager);
+ brillo::dbus_utils::ExportedObjectManager* object_manager);
virtual ~FirewallService() = default;
// Connects to D-Bus system bus and exports methods.
@@ -47,7 +47,7 @@
void OnPermissionBrokerRemoved(const dbus::ObjectPath& path);
#endif // __ANDROID__
- chromeos::dbus_utils::DBusObject dbus_object_;
+ brillo::dbus_utils::DBusObject dbus_object_;
#if !defined(__ANDROID__)
std::unique_ptr<org::chromium::PermissionBroker::ObjectManagerProxy>
permission_broker_;
diff --git a/iptables.cc b/iptables.cc
index 183aeb4..e356ca9 100644
--- a/iptables.cc
+++ b/iptables.cc
@@ -23,8 +23,8 @@
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_util.h>
#include <base/strings/stringprintf.h>
-#include <chromeos/minijail/minijail.h>
-#include <chromeos/process.h>
+#include <brillo/minijail/minijail.h>
+#include <brillo/process.h>
namespace {
#if defined(__ANDROID__)
@@ -366,7 +366,7 @@
}
bool IpTables::ApplyRuleForUserTraffic(bool add) {
- chromeos::ProcessImpl ip;
+ brillo::ProcessImpl ip;
ip.AddArg(kIpPath);
ip.AddArg("rule");
ip.AddArg(add ? "add" : "delete");
@@ -380,7 +380,7 @@
int IpTables::ExecvNonRoot(const std::vector<std::string>& argv,
uint64_t capmask) {
- chromeos::Minijail* m = chromeos::Minijail::GetInstance();
+ brillo::Minijail* m = brillo::Minijail::GetInstance();
minijail* jail = m->New();
#if !defined(__ANDROID__)
// TODO(garnold) This needs to be re-enabled once we figure out which
diff --git a/iptables.h b/iptables.h
index f5dc5a5..511833c 100644
--- a/iptables.h
+++ b/iptables.h
@@ -23,7 +23,7 @@
#include <vector>
#include <base/macros.h>
-#include <chromeos/errors/error.h>
+#include <brillo/errors/error.h>
#include "dbus_bindings/org.chromium.Firewalld.h"
diff --git a/main.cc b/main.cc
index 322e1ab..76e8dd5 100644
--- a/main.cc
+++ b/main.cc
@@ -13,7 +13,7 @@
// limitations under the License.
#include <base/command_line.h>
-#include <chromeos/syslog_logging.h>
+#include <brillo/syslog_logging.h>
#include "firewall_daemon.h"
@@ -21,7 +21,7 @@
int main(int argc, char** argv) {
base::CommandLine::Init(argc, argv);
- chromeos::InitLog(chromeos::kLogToSyslog);
+ brillo::InitLog(brillo::kLogToSyslog);
FirewallDaemon daemon;
return daemon.Run();
