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

10 files changed, 35 insertions, 35 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();
 }
diff --git a/server/dbus_service.cc b/server/dbus_service.cc
index 2520232..09c569f 100644
--- a/server/dbus_service.cc
+++ b/server/dbus_service.cc
@@ -19,7 +19,7 @@
 #include <memory>
 #include <string>
 
-#include <chromeos/bind_lambda.h>
+#include <brillo/bind_lambda.h>
 #include <dbus/bus.h>
 #include <dbus/object_path.h>
 
@@ -33,7 +33,7 @@ DBusService::DBusService(const scoped_refptr<dbus::Bus>& bus,
       service_(service) {}
 
 void DBusService::Register(const CompletionAction& callback) {
-  chromeos::dbus_utils::DBusInterface* dbus_interface =
+  brillo::dbus_utils::DBusInterface* dbus_interface =
       dbus_object_.AddOrGetInterface(kTpmManagerInterface);
 
   dbus_interface->AddMethodHandler(
diff --git a/server/dbus_service.h b/server/dbus_service.h
index 61d6219..e5502c6 100644
--- a/server/dbus_service.h
+++ b/server/dbus_service.h
@@ -19,17 +19,17 @@
 
 #include <memory>
 
-#include <chromeos/dbus/dbus_method_response.h>
-#include <chromeos/dbus/dbus_object.h>
+#include <brillo/dbus/dbus_method_response.h>
+#include <brillo/dbus/dbus_object.h>
 #include <dbus/bus.h>
 
 #include "tpm_manager/common/tpm_manager_interface.h"
 
 namespace tpm_manager {
 
-using chromeos::dbus_utils::DBusMethodResponse;
+using brillo::dbus_utils::DBusMethodResponse;
 using CompletionAction =
-    chromeos::dbus_utils::AsyncEventSequencer::CompletionAction;
+    brillo::dbus_utils::AsyncEventSequencer::CompletionAction;
 
 // Handles D-Bus communtion with the TpmManager daemon.
 class DBusService {
@@ -61,7 +61,7 @@ class DBusService {
       std::unique_ptr<DBusMethodResponse<const ReplyProtobufType&>> response,
       const RequestProtobufType& request);
 
-  chromeos::dbus_utils::DBusObject dbus_object_;
+  brillo::dbus_utils::DBusObject dbus_object_;
   TpmManagerInterface* service_;
   DISALLOW_COPY_AND_ASSIGN(DBusService);
 };
diff --git a/server/dbus_service_test.cc b/server/dbus_service_test.cc
index 1c41056..2e9230a 100644
--- a/server/dbus_service_test.cc
+++ b/server/dbus_service_test.cc
@@ -16,8 +16,8 @@
 
 #include <string>
 
-#include <chromeos/bind_lambda.h>
-#include <chromeos/dbus/dbus_object_test_helpers.h>
+#include <brillo/bind_lambda.h>
+#include <brillo/dbus/dbus_object_test_helpers.h>
 #include <dbus/mock_bus.h>
 #include <dbus/mock_exported_object.h>
 #include <gmock/gmock.h>
@@ -48,7 +48,7 @@ class DBusServiceTest : public testing::Test {
     ON_CALL(*mock_bus_, GetExportedObject(path))
         .WillByDefault(Return(mock_exported_object_.get()));
     dbus_service_.reset(new DBusService(mock_bus_, &mock_service_));
-    dbus_service_->Register(chromeos::dbus_utils::AsyncEventSequencer::
+    dbus_service_->Register(brillo::dbus_utils::AsyncEventSequencer::
                                 GetDefaultCompletionAction());
   }
 
@@ -66,7 +66,7 @@ class DBusServiceTest : public testing::Test {
 
  protected:
   std::unique_ptr<dbus::Response> CallMethod(dbus::MethodCall* method_call) {
-    return chromeos::dbus_utils::testing::CallMethod(
+    return brillo::dbus_utils::testing::CallMethod(
         dbus_service_->dbus_object_, method_call);
   }
 
diff --git a/server/main.cc b/server/main.cc
index ce87bc0..b170c9a 100644
--- a/server/main.cc
+++ b/server/main.cc
@@ -18,11 +18,11 @@
 #include <string>
 
 #include <base/command_line.h>
-#include <chromeos/daemons/dbus_daemon.h>
-#include <chromeos/dbus/async_event_sequencer.h>
-#include <chromeos/minijail/minijail.h>
-#include <chromeos/syslog_logging.h>
-#include <chromeos/userdb_utils.h>
+#include <brillo/daemons/dbus_daemon.h>
+#include <brillo/dbus/async_event_sequencer.h>
+#include <brillo/minijail/minijail.h>
+#include <brillo/syslog_logging.h>
+#include <brillo/userdb_utils.h>
 
 #include "tpm_manager/common/dbus_interface.h"
 #include "tpm_manager/server/dbus_service.h"
@@ -37,16 +37,16 @@
 #include "tpm_manager/server/tpm_status_impl.h"
 #endif
 
-using chromeos::dbus_utils::AsyncEventSequencer;
+using brillo::dbus_utils::AsyncEventSequencer;
 
 namespace {
 
 const char kWaitForOwnershipTriggerSwitch[] = "wait_for_ownership_trigger";
 
-class TpmManagerDaemon : public chromeos::DBusServiceDaemon {
+class TpmManagerDaemon : public brillo::DBusServiceDaemon {
  public:
   TpmManagerDaemon()
-      : chromeos::DBusServiceDaemon(tpm_manager::kTpmManagerServiceName) {
+      : brillo::DBusServiceDaemon(tpm_manager::kTpmManagerServiceName) {
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     local_data_store_.reset(new tpm_manager::LocalDataStoreImpl());
 #if USE_TPM2
@@ -70,7 +70,7 @@ class TpmManagerDaemon : public chromeos::DBusServiceDaemon {
 
  protected:
   int OnInit() override {
-    int result = chromeos::DBusServiceDaemon::OnInit();
+    int result = brillo::DBusServiceDaemon::OnInit();
     if (result != EX_OK) {
       LOG(ERROR) << "Error starting tpm_manager dbus daemon.";
       return result;
@@ -100,7 +100,7 @@ class TpmManagerDaemon : public chromeos::DBusServiceDaemon {
 
 int main(int argc, char* argv[]) {
   base::CommandLine::Init(argc, argv);
-  chromeos::InitLog(chromeos::kLogToSyslog | chromeos::kLogToStderr);
+  brillo::InitLog(brillo::kLogToSyslog | brillo::kLogToStderr);
   TpmManagerDaemon daemon;
   LOG(INFO) << "TpmManager Daemon Started.";
   return daemon.Run();
diff --git a/server/tpm_manager_service.cc b/server/tpm_manager_service.cc
index ca0107a..ac6992b 100644
--- a/server/tpm_manager_service.cc
+++ b/server/tpm_manager_service.cc
@@ -18,7 +18,7 @@
 
 #include <base/callback.h>
 #include <base/command_line.h>
-#include <chromeos/bind_lambda.h>
+#include <brillo/bind_lambda.h>
 
 namespace tpm_manager {
 
diff --git a/server/tpm_manager_service.h b/server/tpm_manager_service.h
index 6871436..6fc7afa 100644
--- a/server/tpm_manager_service.h
+++ b/server/tpm_manager_service.h
@@ -25,7 +25,7 @@
 #include <base/macros.h>
 #include <base/memory/weak_ptr.h>
 #include <base/threading/thread.h>
-#include <chromeos/bind_lambda.h>
+#include <brillo/bind_lambda.h>
 
 #include "tpm_manager/server/local_data_store.h"
 #include "tpm_manager/server/tpm_initializer.h"
diff --git a/tpm_manager_testrunner.cc b/tpm_manager_testrunner.cc
index e65761a..2aac479 100644
--- a/tpm_manager_testrunner.cc
+++ b/tpm_manager_testrunner.cc
@@ -17,12 +17,12 @@
 #include <base/at_exit.h>
 #include <base/command_line.h>
 #include <base/logging.h>
-#include <chromeos/syslog_logging.h>
+#include <brillo/syslog_logging.h>
 #include <gtest/gtest.h>
 
 int main(int argc, char **argv) {
   base::CommandLine::Init(argc, argv);
-  chromeos::InitLog(chromeos::kLogToStderr);
+  brillo::InitLog(brillo::kLogToStderr);
   // Enable verbose logging while running unit tests.
   logging::SetMinLogLevel(logging::LOG_VERBOSE);
   base::AtExitManager exit_manager;