summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@google.com>2015-10-13 10:24:47 -0700
committerAlex Vakulenko <avakulenko@google.com>2015-10-13 10:24:47 -0700
commita08ddea5f4b861ddf1f4e91bb9c4c34e23dc0ba9 (patch)
tree34cfc05c11194dc656b826712c62a2cc7ed9cfe0 /client
parent644d8287015a0be315a49863b005f1237c280d6b (diff)
downloadtpm_manager-a08ddea5f4b861ddf1f4e91bb9c4c34e23dc0ba9.tar.gz
tpm_manager: 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: I7c6d56d10263c9b8c76947c2e2d0131209d2e5d8
Diffstat (limited to 'client')
-rw-r--r--client/dbus_proxy.cc8
-rw-r--r--client/dbus_proxy_test.cc2
-rw-r--r--client/main.cc10
3 files changed, 10 insertions, 10 deletions
diff --git a/client/dbus_proxy.cc b/client/dbus_proxy.cc
index a0dfdd0..18c1190 100644
--- a/client/dbus_proxy.cc
+++ b/client/dbus_proxy.cc
@@ -16,8 +16,8 @@
#include "tpm_manager/client/dbus_proxy.h"
-#include <chromeos/bind_lambda.h>
-#include <chromeos/dbus/dbus_method_invoker.h>
+#include <brillo/bind_lambda.h>
+#include <brillo/dbus/dbus_method_invoker.h>
#include "tpm_manager/common/dbus_interface.h"
@@ -102,12 +102,12 @@ template<typename ReplyProtobufType,
void DBusProxy::CallMethod(const std::string& method_name,
const RequestProtobufType& request,
const CallbackType& callback) {
- auto on_error = [callback](chromeos::Error* error) {
+ auto on_error = [callback](brillo::Error* error) {
ReplyProtobufType reply;
reply.set_status(STATUS_NOT_AVAILABLE);
callback.Run(reply);
};
- chromeos::dbus_utils::CallMethodWithTimeout(
+ brillo::dbus_utils::CallMethodWithTimeout(
kDBusTimeoutMS,
object_proxy_,
tpm_manager::kTpmManagerInterface,
diff --git a/client/dbus_proxy_test.cc b/client/dbus_proxy_test.cc
index bb03fc9..b299b41 100644
--- a/client/dbus_proxy_test.cc
+++ b/client/dbus_proxy_test.cc
@@ -16,7 +16,7 @@
#include <string>
-#include <chromeos/bind_lambda.h>
+#include <brillo/bind_lambda.h>
#include <dbus/mock_object_proxy.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/client/main.cc b/client/main.cc
index 124d88d..75b00fe 100644
--- a/client/main.cc
+++ b/client/main.cc
@@ -24,9 +24,9 @@
#include <base/command_line.h>
#include <base/logging.h>
#include <base/message_loop/message_loop.h>
-#include <chromeos/bind_lambda.h>
-#include <chromeos/daemons/daemon.h>
-#include <chromeos/syslog_logging.h>
+#include <brillo/bind_lambda.h>
+#include <brillo/daemons/daemon.h>
+#include <brillo/syslog_logging.h>
#include "tpm_manager/client/dbus_proxy.h"
#include "tpm_manager/common/dbus_interface.pb.h"
@@ -78,7 +78,7 @@ Arguments (used as switches):
Data to write to NV space.
)";
-using ClientLoopBase = chromeos::Daemon;
+using ClientLoopBase = brillo::Daemon;
class ClientLoop : public ClientLoopBase {
public:
ClientLoop() = default;
@@ -298,7 +298,7 @@ class ClientLoop : public ClientLoopBase {
int main(int argc, char* argv[]) {
base::CommandLine::Init(argc, argv);
- chromeos::InitLog(chromeos::kLogToSyslog | chromeos::kLogToStderr);
+ brillo::InitLog(brillo::kLogToSyslog | brillo::kLogToStderr);
tpm_manager::ClientLoop loop;
return loop.Run();
}