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/service_unittest.cc b/service_unittest.cc
index 509b9a0..986e435 100644
--- a/service_unittest.cc
+++ b/service_unittest.cc
@@ -20,7 +20,7 @@
#include <base/strings/string_util.h>
#include <base/strings/stringprintf.h>
-#include <chromeos/process_mock.h>
+#include <brillo/process_mock.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@@ -38,7 +38,7 @@
#include "apmanager/mock_manager.h"
#include "apmanager/mock_process_factory.h"
-using chromeos::ProcessMock;
+using brillo::ProcessMock;
using ::testing::_;
using ::testing::Mock;
using ::testing::Return;
@@ -75,7 +75,7 @@
}
void StartDummyProcess() {
- service_.hostapd_process_.reset(new chromeos::ProcessImpl);
+ service_.hostapd_process_.reset(new brillo::ProcessImpl);
service_.hostapd_process_->AddArg(kBinSleep);
service_.hostapd_process_->AddArg("12345");
CHECK(service_.hostapd_process_->Start());
@@ -97,7 +97,7 @@
MATCHER_P(IsServiceErrorStartingWith, message, "") {
return arg != nullptr &&
- arg->GetDomain() == chromeos::errors::dbus::kDomain &&
+ arg->GetDomain() == brillo::errors::dbus::kDomain &&
arg->GetCode() == kServiceError &&
base::EndsWith(arg->GetMessage(), message, false);
}
@@ -105,7 +105,7 @@
TEST_F(ServiceTest, StartWhenServiceAlreadyRunning) {
StartDummyProcess();
- chromeos::ErrorPtr error;
+ brillo::ErrorPtr error;
EXPECT_FALSE(service_.Start(&error));
EXPECT_THAT(error, IsServiceErrorStartingWith("Service already running"));
}
@@ -114,7 +114,7 @@
MockConfig* config = new MockConfig();
SetConfig(config);
- chromeos::ErrorPtr error;
+ brillo::ErrorPtr error;
EXPECT_CALL(*config, GenerateConfigFile(_, _)).WillOnce(Return(false));
EXPECT_FALSE(service_.Start(&error));
EXPECT_THAT(error, IsServiceErrorStartingWith(
@@ -131,7 +131,7 @@
ProcessMock* process = new ProcessMock();
std::string config_str(kHostapdConfig);
- chromeos::ErrorPtr error;
+ brillo::ErrorPtr error;
EXPECT_CALL(*config, GenerateConfigFile(_, _)).WillOnce(
DoAll(SetArgPointee<1>(config_str), Return(true)));
EXPECT_CALL(*file_writer_, Write(kHostapdConfigFilePath, kHostapdConfig))
@@ -149,7 +149,7 @@
}
TEST_F(ServiceTest, StopWhenServiceNotRunning) {
- chromeos::ErrorPtr error;
+ brillo::ErrorPtr error;
EXPECT_FALSE(service_.Stop(&error));
EXPECT_THAT(error, IsServiceErrorStartingWith(
"Service is not currently running"));
@@ -160,7 +160,7 @@
MockConfig* config = new MockConfig();
SetConfig(config);
- chromeos::ErrorPtr error;
+ brillo::ErrorPtr error;
EXPECT_CALL(*config, ReleaseDevice()).Times(1);
EXPECT_TRUE(service_.Stop(&error));
}