apmanager: 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
TEST=built for aosp and brillo, all unit tests pass on dragonboard
Change-Id: I4c6efbc5bbf80d251e5d91bc3db49f02bc0e4732
diff --git a/config.cc b/config.cc
index f3e2027..ba865e0 100644
--- a/config.cc
+++ b/config.cc
@@ -28,9 +28,9 @@
#include "apmanager/device.h"
#include "apmanager/manager.h"
-using chromeos::dbus_utils::AsyncEventSequencer;
-using chromeos::dbus_utils::ExportedObjectManager;
-using chromeos::ErrorPtr;
+using brillo::dbus_utils::AsyncEventSequencer;
+using brillo::dbus_utils::ExportedObjectManager;
+using brillo::ErrorPtr;
using std::string;
namespace apmanager {
@@ -124,8 +124,8 @@
bool Config::ValidateSsid(ErrorPtr* error, const string& value) {
if (value.length() < kSsidMinLength || value.length() > kSsidMaxLength) {
- chromeos::Error::AddToPrintf(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddToPrintf(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"SSID must contain between %d and %d characters",
kSsidMinLength, kSsidMaxLength);
return false;
@@ -135,8 +135,8 @@
bool Config::ValidateSecurityMode(ErrorPtr* error, const string& value) {
if (value != kSecurityModeNone && value != kSecurityModeRSN) {
- chromeos::Error::AddToPrintf(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddToPrintf(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"Invalid/unsupported security mode [%s]", value.c_str());
return false;
}
@@ -146,8 +146,8 @@
bool Config::ValidatePassphrase(ErrorPtr* error, const string& value) {
if (value.length() < kPassphraseMinLength ||
value.length() > kPassphraseMaxLength) {
- chromeos::Error::AddToPrintf(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddToPrintf(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"Passphrase must contain between %d and %d characters",
kPassphraseMinLength, kPassphraseMaxLength);
return false;
@@ -159,8 +159,8 @@
if (value != kHwMode80211a && value != kHwMode80211b &&
value != kHwMode80211g && value != kHwMode80211n &&
value != kHwMode80211ac) {
- chromeos::Error::AddToPrintf(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddToPrintf(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"Invalid HW mode [%s]", value.c_str());
return false;
}
@@ -169,8 +169,8 @@
bool Config::ValidateOperationMode(ErrorPtr* error, const string& value) {
if (value != kOperationModeServer && value != kOperationModeBridge) {
- chromeos::Error::AddToPrintf(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddToPrintf(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"Invalid operation mode [%s]", value.c_str());
return false;
}
@@ -182,8 +182,8 @@
(value >= kBand5GHzChannelLow && value <= kBand5GHzChannelHigh)) {
return true;
}
- chromeos::Error::AddToPrintf(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddToPrintf(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"Invalid channel [%d]", value);
return false;
}
@@ -193,7 +193,7 @@
AsyncEventSequencer* sequencer) {
CHECK(!dbus_object_) << "Already registered";
dbus_object_.reset(
- new chromeos::dbus_utils::DBusObject(
+ new brillo::dbus_utils::DBusObject(
object_manager,
bus,
dbus_path_));
@@ -206,8 +206,8 @@
// SSID.
string ssid = GetSsid();
if (ssid.empty()) {
- chromeos::Error::AddTo(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddTo(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"SSID not specified");
return false;
}
@@ -217,8 +217,8 @@
// Bridge interface is required for bridge mode operation.
if (GetOperationMode() == kOperationModeBridge) {
if (GetBridgeInterface().empty()) {
- chromeos::Error::AddTo(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddTo(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"Bridge interface not specified, required for bridge mode");
return false;
}
@@ -304,8 +304,8 @@
// Get HT Capability.
string ht_cap;
if (!device_->GetHTCapability(GetChannel(), &ht_cap)) {
- chromeos::Error::AddTo(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddTo(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"Failed to get HT Capability");
return false;
}
@@ -323,8 +323,8 @@
// TODO(zqiu): Determine VHT Capabilities based on the interface PHY's
// capababilites.
} else {
- chromeos::Error::AddToPrintf(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddToPrintf(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"Invalid hardware mode: %s", hw_mode.c_str());
return false;
}
@@ -362,23 +362,23 @@
// Ask manager for unused ap capable device.
device_ = manager_->GetAvailableDevice();
if (!device_) {
- chromeos::Error::AddTo(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddTo(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"No device available");
return false;
}
} else {
device_ = manager_->GetDeviceFromInterfaceName(interface);
if (!device_) {
- chromeos::Error::AddToPrintf(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddToPrintf(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"Unable to find device for the specified interface [%s]",
interface.c_str());
return false;
}
if (device_->GetInUse()) {
- chromeos::Error::AddToPrintf(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddToPrintf(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"Device [%s] for interface [%s] already in use",
device_->GetDeviceName().c_str(),
interface.c_str());
@@ -406,8 +406,8 @@
if (security_mode == kSecurityModeRSN) {
string passphrase = GetPassphrase();
if (passphrase.empty()) {
- chromeos::Error::AddToPrintf(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddToPrintf(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"Passphrase not set for security mode: %s", security_mode.c_str());
return false;
}
@@ -428,8 +428,8 @@
return true;
}
- chromeos::Error::AddToPrintf(
- error, FROM_HERE, chromeos::errors::dbus::kDomain, kConfigError,
+ brillo::Error::AddToPrintf(
+ error, FROM_HERE, brillo::errors::dbus::kDomain, kConfigError,
"Invalid security mode: %s", security_mode.c_str());
return false;
}