webservd: 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: Iba15692972a0c24ec87ac8e51d4eb032214149b0
diff --git a/libwebserv/export.h b/libwebserv/export.h
index ff68423..78d11f4 100644
--- a/libwebserv/export.h
+++ b/libwebserv/export.h
@@ -16,7 +16,7 @@
#define WEBSERVER_LIBWEBSERV_EXPORT_H_
// See detailed explanation of the purpose of LIBWEBSERV_EXPORT in
-// chromeos/chromeos_export.h for similar attribute - CHROMEOS_EXPORT.
+// brillo/brillo_export.h for similar attribute - BRILLO_EXPORT.
#define LIBWEBSERV_EXPORT __attribute__((__visibility__("default")))
#define LIBWEBSERV_PRIVATE __attribute__((__visibility__("hidden")))
diff --git a/libwebserv/protocol_handler.cc b/libwebserv/protocol_handler.cc
index 7224ceb..df8c255 100644
--- a/libwebserv/protocol_handler.cc
+++ b/libwebserv/protocol_handler.cc
@@ -17,9 +17,9 @@
#include <tuple>
#include <base/logging.h>
-#include <chromeos/map_utils.h>
-#include <chromeos/streams/file_stream.h>
-#include <chromeos/streams/stream_utils.h>
+#include <brillo/map_utils.h>
+#include <brillo/streams/file_stream.h>
+#include <brillo/streams/stream_utils.h>
#include "dbus_bindings/org.chromium.WebServer.RequestHandler.h"
#include "libwebserv/request.h"
@@ -33,22 +33,22 @@
namespace {
// Dummy callback for async D-Bus errors.
-void IgnoreDBusError(chromeos::Error* error) {}
+void IgnoreDBusError(brillo::Error* error) {}
// Copies the data from |src_stream| to the destination stream represented
// by a file descriptor |fd|.
-void WriteResponseData(chromeos::StreamPtr src_stream,
+void WriteResponseData(brillo::StreamPtr src_stream,
const dbus::FileDescriptor& fd) {
int dupfd = dup(fd.value());
auto dest_stream =
- chromeos::FileStream::FromFileDescriptor(dupfd, true, nullptr);
+ brillo::FileStream::FromFileDescriptor(dupfd, true, nullptr);
CHECK(dest_stream);
// Dummy callbacks for success/error of data-copy operation. We ignore both
// notifications here.
- auto on_success = [](chromeos::StreamPtr, chromeos::StreamPtr, uint64_t) {};
- auto on_error = [](chromeos::StreamPtr, chromeos::StreamPtr,
- const chromeos::Error*) {};
- chromeos::stream_utils::CopyData(
+ auto on_success = [](brillo::StreamPtr, brillo::StreamPtr, uint64_t) {};
+ auto on_error = [](brillo::StreamPtr, brillo::StreamPtr,
+ const brillo::Error*) {};
+ brillo::stream_utils::CopyData(
std::move(src_stream), std::move(dest_stream), base::Bind(on_success),
base::Bind(on_error));
}
@@ -68,7 +68,7 @@
// We need to get a copy of the map keys since removing the handlers will
// modify the map in the middle of the loop and that's not a good thing.
- auto handler_ids = chromeos::GetMapKeys(request_handlers_);
+ auto handler_ids = brillo::GetMapKeys(request_handlers_);
for (int handler_id : handler_ids) {
RemoveHandler(handler_id);
}
@@ -92,8 +92,8 @@
return protocols;
}
-chromeos::Blob ProtocolHandler::GetCertificateFingerprint() const {
- chromeos::Blob fingerprint;
+brillo::Blob ProtocolHandler::GetCertificateFingerprint() const {
+ brillo::Blob fingerprint;
for (const auto& pair : proxies_) {
fingerprint = pair.second->certificate_fingerprint();
if (!fingerprint.empty())
@@ -190,7 +190,7 @@
remote_handler_id_map_.emplace(remote_handler_id, handler_id);
}
-void ProtocolHandler::AddHandlerError(int handler_id, chromeos::Error* error) {
+void ProtocolHandler::AddHandlerError(int handler_id, brillo::Error* error) {
// Nothing to do at the moment.
}
@@ -198,24 +198,24 @@
const std::string& remote_handler_id,
const std::string& request_id,
std::unique_ptr<Request> request,
- chromeos::ErrorPtr* error) {
+ brillo::ErrorPtr* error) {
request_id_map_.emplace(request_id, protocol_handler_id);
auto id_iter = remote_handler_id_map_.find(remote_handler_id);
if (id_iter == remote_handler_id_map_.end()) {
- chromeos::Error::AddToPrintf(error, FROM_HERE,
- chromeos::errors::dbus::kDomain,
- DBUS_ERROR_FAILED,
- "Unknown request handler '%s'",
- remote_handler_id.c_str());
+ brillo::Error::AddToPrintf(error, FROM_HERE,
+ brillo::errors::dbus::kDomain,
+ DBUS_ERROR_FAILED,
+ "Unknown request handler '%s'",
+ remote_handler_id.c_str());
return false;
}
auto handler_iter = request_handlers_.find(id_iter->second);
if (handler_iter == request_handlers_.end()) {
- chromeos::Error::AddToPrintf(error, FROM_HERE,
- chromeos::errors::dbus::kDomain,
- DBUS_ERROR_FAILED,
- "Handler # %d is no longer available",
- id_iter->second);
+ brillo::Error::AddToPrintf(error, FROM_HERE,
+ brillo::errors::dbus::kDomain,
+ DBUS_ERROR_FAILED,
+ "Handler # %d is no longer available",
+ id_iter->second);
return false;
}
handler_iter->second.handler->HandleRequest(
@@ -228,7 +228,7 @@
const std::string& request_id,
int status_code,
const std::multimap<std::string, std::string>& headers,
- chromeos::StreamPtr data_stream) {
+ brillo::StreamPtr data_stream) {
ProtocolHandlerProxy* proxy = GetRequestProtocolHandlerProxy(request_id);
if (!proxy)
return;
@@ -250,8 +250,8 @@
void ProtocolHandler::GetFileData(
const std::string& request_id,
int file_id,
- const base::Callback<void(chromeos::StreamPtr)>& success_callback,
- const base::Callback<void(chromeos::Error*)>& error_callback) {
+ const base::Callback<void(brillo::StreamPtr)>& success_callback,
+ const base::Callback<void(brillo::Error*)>& error_callback) {
ProtocolHandlerProxy* proxy = GetRequestProtocolHandlerProxy(request_id);
CHECK(proxy);
@@ -262,24 +262,24 @@
// constant). So, here we move both callbacks to |Callbacks| structure and
// use a shared pointer to it in both success and error callback wrappers.
struct Callbacks {
- base::Callback<void(chromeos::StreamPtr)> on_success;
- base::Callback<void(chromeos::Error*)> on_error;
+ base::Callback<void(brillo::StreamPtr)> on_success;
+ base::Callback<void(brillo::Error*)> on_error;
};
auto callbacks = std::make_shared<Callbacks>();
callbacks->on_success = success_callback;
callbacks->on_error = error_callback;
auto on_success = [callbacks](const dbus::FileDescriptor& fd) {
- chromeos::ErrorPtr error;
+ brillo::ErrorPtr error;
// Unfortunately there is no way to take ownership of the file descriptor
// since |fd| is a const reference, so duplicate the descriptor.
int dupfd = dup(fd.value());
- auto stream = chromeos::FileStream::FromFileDescriptor(dupfd, true, &error);
+ auto stream = brillo::FileStream::FromFileDescriptor(dupfd, true, &error);
if (!stream)
return callbacks->on_error.Run(error.get());
callbacks->on_success.Run(std::move(stream));
};
- auto on_error = [callbacks](chromeos::Error* error) {
+ auto on_error = [callbacks](brillo::Error* error) {
callbacks->on_error.Run(error);
};
diff --git a/libwebserv/protocol_handler.h b/libwebserv/protocol_handler.h
index 797c19a..ab4a749 100644
--- a/libwebserv/protocol_handler.h
+++ b/libwebserv/protocol_handler.h
@@ -24,9 +24,9 @@
#include <base/callback_forward.h>
#include <base/macros.h>
#include <base/memory/weak_ptr.h>
-#include <chromeos/errors/error.h>
-#include <chromeos/secure_blob.h>
-#include <chromeos/streams/stream.h>
+#include <brillo/errors/error.h>
+#include <brillo/secure_blob.h>
+#include <brillo/streams/stream.h>
#include <dbus/object_path.h>
#include <libwebserv/export.h>
@@ -79,7 +79,7 @@
// byte buffer if this handler does not serve the HTTPS protocol.
// If the handler is not connected to the server, this will return an empty
// array.
- chromeos::Blob GetCertificateFingerprint() const;
+ brillo::Blob GetCertificateFingerprint() const;
// Adds a request handler for given |url|. If the |url| ends with a '/', this
// makes the handler respond to any URL beneath this path.
@@ -153,21 +153,21 @@
ProtocolHandlerProxy* proxy,
const std::string& remote_handler_id);
LIBWEBSERV_PRIVATE void AddHandlerError(int handler_id,
- chromeos::Error* error);
+ brillo::Error* error);
// Called by Server when an incoming request is dispatched.
LIBWEBSERV_PRIVATE bool ProcessRequest(const std::string& protocol_handler_id,
const std::string& remote_handler_id,
const std::string& request_id,
std::unique_ptr<Request> request,
- chromeos::ErrorPtr* error);
+ brillo::ErrorPtr* error);
// Called by Response object to finish the request and send response data.
LIBWEBSERV_PRIVATE void CompleteRequest(
const std::string& request_id,
int status_code,
const std::multimap<std::string, std::string>& headers,
- chromeos::StreamPtr data_stream);
+ brillo::StreamPtr data_stream);
// Makes a call to the (remote) web server request handler over D-Bus to
// obtain the file content of uploaded file (identified by |file_id|) during
@@ -175,8 +175,8 @@
LIBWEBSERV_PRIVATE void GetFileData(
const std::string& request_id,
int file_id,
- const base::Callback<void(chromeos::StreamPtr)>& success_callback,
- const base::Callback<void(chromeos::Error*)>& error_callback);
+ const base::Callback<void(brillo::StreamPtr)>& success_callback,
+ const base::Callback<void(brillo::Error*)>& error_callback);
// A helper method to obtain a corresponding protocol handler D-Bus proxy for
// outstanding request with ID |request_id|.
diff --git a/libwebserv/request.cc b/libwebserv/request.cc
index 93b80c4..f0bdd79 100644
--- a/libwebserv/request.cc
+++ b/libwebserv/request.cc
@@ -15,8 +15,8 @@
#include <libwebserv/request.h>
#include <base/callback.h>
-#include <chromeos/http/http_utils.h>
-#include <chromeos/streams/file_stream.h>
+#include <brillo/http/http_utils.h>
+#include <brillo/streams/file_stream.h>
#include <libwebserv/protocol_handler.h>
@@ -37,8 +37,8 @@
}
void FileInfo::GetData(
- const base::Callback<void(chromeos::StreamPtr)>& success_callback,
- const base::Callback<void(chromeos::Error*)>& error_callback) const {
+ const base::Callback<void(brillo::StreamPtr)>& success_callback,
+ const base::Callback<void(brillo::Error*)>& error_callback) const {
handler_->GetFileData(request_id_,
file_id_,
success_callback,
@@ -54,8 +54,8 @@
Request::~Request() {
}
-chromeos::StreamPtr Request::GetDataStream() {
- return chromeos::FileStream::FromFileDescriptor(
+brillo::StreamPtr Request::GetDataStream() {
+ return brillo::FileStream::FromFileDescriptor(
raw_data_fd_.GetPlatformFile(), false, nullptr);
}
@@ -138,7 +138,7 @@
std::vector<std::string> Request::GetHeader(const std::string& name) const {
std::vector<std::string> data;
auto range =
- headers_.equal_range(chromeos::http::GetCanonicalHeaderName(name));
+ headers_.equal_range(brillo::http::GetCanonicalHeaderName(name));
while (range.first != range.second) {
data.push_back(range.first->second);
++range.first;
@@ -147,7 +147,7 @@
}
std::string Request::GetFirstHeader(const std::string& name) const {
- auto p = headers_.find(chromeos::http::GetCanonicalHeaderName(name));
+ auto p = headers_.find(brillo::http::GetCanonicalHeaderName(name));
return (p != headers_.end()) ? p->second : std::string{};
}
diff --git a/libwebserv/request.h b/libwebserv/request.h
index e655be6..63bea8e 100644
--- a/libwebserv/request.h
+++ b/libwebserv/request.h
@@ -25,8 +25,8 @@
#include <base/files/file.h>
#include <base/macros.h>
#include <base/memory/ref_counted.h>
-#include <chromeos/errors/error.h>
-#include <chromeos/streams/stream.h>
+#include <brillo/errors/error.h>
+#include <brillo/streams/stream.h>
#include <libwebserv/export.h>
struct MHD_Connection;
@@ -45,8 +45,8 @@
const std::string& GetContentType() const { return content_type_; }
const std::string& GetTransferEncoding() const { return transfer_encoding_; }
void GetData(
- const base::Callback<void(chromeos::StreamPtr)>& success_callback,
- const base::Callback<void(chromeos::Error*)>& error_callback) const;
+ const base::Callback<void(brillo::StreamPtr)>& success_callback,
+ const base::Callback<void(brillo::Error*)>& error_callback) const;
private:
friend class Server;
@@ -81,7 +81,7 @@
// The stream returned is valid for as long as the Request object itself is
// alive. Accessing the stream after the Request object is destroyed will lead
// to an undefined behavior (will likely just crash).
- chromeos::StreamPtr GetDataStream();
+ brillo::StreamPtr GetDataStream();
// Returns the request path (e.g. "/path/document").
const std::string& GetPath() const { return url_; }
diff --git a/libwebserv/request_utils.cc b/libwebserv/request_utils.cc
index 0c80a21..a7e1043 100644
--- a/libwebserv/request_utils.cc
+++ b/libwebserv/request_utils.cc
@@ -15,8 +15,8 @@
#include <libwebserv/request_utils.h>
#include <base/bind.h>
-#include <chromeos/streams/memory_stream.h>
-#include <chromeos/streams/stream_utils.h>
+#include <brillo/streams/memory_stream.h>
+#include <brillo/streams/stream_utils.h>
#include <libwebserv/request.h>
#include <libwebserv/response.h>
@@ -33,7 +33,7 @@
};
void OnCopySuccess(std::shared_ptr<RequestDataContainer> container,
- chromeos::StreamPtr in_stream, chromeos::StreamPtr out_stream,
+ brillo::StreamPtr in_stream, brillo::StreamPtr out_stream,
uint64_t size_copied) {
// Close/release the memory stream so we can work with underlying data buffer.
out_stream->CloseBlocking(nullptr);
@@ -44,8 +44,8 @@
}
void OnCopyError(std::shared_ptr<RequestDataContainer> container,
- chromeos::StreamPtr in_stream, chromeos::StreamPtr out_stream,
- const chromeos::Error* error) {
+ brillo::StreamPtr in_stream, brillo::StreamPtr out_stream,
+ const brillo::Error* error) {
container->error_callback.Run(std::move(container->request),
std::move(container->response), error);
}
@@ -59,14 +59,14 @@
auto container = std::make_shared<RequestDataContainer>();
auto in_stream = request->GetDataStream();
auto out_stream =
- chromeos::MemoryStream::CreateRef(&container->data, nullptr);
+ brillo::MemoryStream::CreateRef(&container->data, nullptr);
container->request = std::move(request);
container->response = std::move(response);
container->success_callback = success_callback;
container->error_callback = error_callback;
- chromeos::stream_utils::CopyData(std::move(in_stream), std::move(out_stream),
- base::Bind(&OnCopySuccess, container),
- base::Bind(&OnCopyError, container));
+ brillo::stream_utils::CopyData(std::move(in_stream), std::move(out_stream),
+ base::Bind(&OnCopySuccess, container),
+ base::Bind(&OnCopyError, container));
}
} // namespace libwebserv
diff --git a/libwebserv/request_utils.h b/libwebserv/request_utils.h
index c825c3c..390f1d5 100644
--- a/libwebserv/request_utils.h
+++ b/libwebserv/request_utils.h
@@ -19,7 +19,7 @@
#include <vector>
#include <base/callback_forward.h>
-#include <chromeos/errors/error.h>
+#include <brillo/errors/error.h>
#include <libwebserv/export.h>
namespace libwebserv {
@@ -35,7 +35,7 @@
using GetRequestDataErrorCallback =
base::Callback<void(std::unique_ptr<Request> request,
std::unique_ptr<Response> response,
- const chromeos::Error* error)>;
+ const brillo::Error* error)>;
// Reads the request data from |request| asynchronously and returns the data
// by calling |success_callback|. If an error occurred, |error_callback| is
diff --git a/libwebserv/response.cc b/libwebserv/response.cc
index 9fc61d6..59dc51f 100644
--- a/libwebserv/response.cc
+++ b/libwebserv/response.cc
@@ -19,10 +19,10 @@
#include <base/json/json_writer.h>
#include <base/logging.h>
#include <base/values.h>
-#include <chromeos/http/http_request.h>
-#include <chromeos/mime_utils.h>
-#include <chromeos/streams/memory_stream.h>
-#include <chromeos/strings/string_utils.h>
+#include <brillo/http/http_request.h>
+#include <brillo/mime_utils.h>
+#include <brillo/streams/memory_stream.h>
+#include <brillo/strings/string_utils.h>
#include <libwebserv/protocol_handler.h>
namespace libwebserv {
@@ -33,7 +33,7 @@
Response::~Response() {
if (!reply_sent_) {
- ReplyWithError(chromeos::http::status_code::InternalServerError,
+ ReplyWithError(brillo::http::status_code::InternalServerError,
"Internal server error");
}
}
@@ -49,19 +49,19 @@
}
void Response::Reply(int status_code,
- chromeos::StreamPtr data_stream,
+ brillo::StreamPtr data_stream,
const std::string& mime_type) {
CHECK(data_stream);
status_code_ = status_code;
data_stream_ = std::move(data_stream);
- AddHeader(chromeos::http::response_header::kContentType, mime_type);
+ AddHeader(brillo::http::response_header::kContentType, mime_type);
SendResponse();
}
void Response::ReplyWithText(int status_code,
const std::string& text,
const std::string& mime_type) {
- Reply(status_code, chromeos::MemoryStream::OpenCopyOf(text, nullptr),
+ Reply(status_code, brillo::MemoryStream::OpenCopyOf(text, nullptr),
mime_type);
}
@@ -69,9 +69,9 @@
std::string text;
base::JSONWriter::WriteWithOptions(
*json, base::JSONWriter::OPTIONS_PRETTY_PRINT, &text);
- std::string mime_type = chromeos::mime::AppendParameter(
- chromeos::mime::application::kJson,
- chromeos::mime::parameters::kCharset,
+ std::string mime_type = brillo::mime::AppendParameter(
+ brillo::mime::application::kJson,
+ brillo::mime::parameters::kCharset,
"utf-8");
ReplyWithText(status_code, text, mime_type);
}
@@ -86,18 +86,18 @@
}
void Response::Redirect(int status_code, const std::string& redirect_url) {
- AddHeader(chromeos::http::response_header::kLocation, redirect_url);
+ AddHeader(brillo::http::response_header::kLocation, redirect_url);
ReplyWithError(status_code, "");
}
void Response::ReplyWithError(int status_code, const std::string& error_text) {
status_code_ = status_code;
- data_stream_ = chromeos::MemoryStream::OpenCopyOf(error_text, nullptr);
+ data_stream_ = brillo::MemoryStream::OpenCopyOf(error_text, nullptr);
SendResponse();
}
void Response::ReplyWithErrorNotFound() {
- ReplyWithError(chromeos::http::status_code::NotFound, "Not Found");
+ ReplyWithError(brillo::http::status_code::NotFound, "Not Found");
}
void Response::SendResponse() {
diff --git a/libwebserv/response.h b/libwebserv/response.h
index 1919c09..fdd9cad 100644
--- a/libwebserv/response.h
+++ b/libwebserv/response.h
@@ -22,7 +22,7 @@
#include <vector>
#include <base/macros.h>
-#include <chromeos/streams/stream.h>
+#include <brillo/streams/stream.h>
#include <libwebserv/export.h>
namespace base {
@@ -48,7 +48,7 @@
// Generic reply method for sending arbitrary binary data response.
void Reply(int status_code,
- chromeos::StreamPtr data_stream,
+ brillo::StreamPtr data_stream,
const std::string& mime_type);
// Reply with text body.
@@ -87,7 +87,7 @@
ProtocolHandler* handler_{nullptr};
std::string request_id_;
int status_code_{0};
- chromeos::StreamPtr data_stream_;
+ brillo::StreamPtr data_stream_;
std::multimap<std::string, std::string> headers_;
bool reply_sent_{false};
diff --git a/libwebserv/server.cc b/libwebserv/server.cc
index a15f7ab..5c42868 100644
--- a/libwebserv/server.cc
+++ b/libwebserv/server.cc
@@ -30,7 +30,7 @@
public:
explicit RequestHandler(Server* server) : server_{server} {}
bool ProcessRequest(
- chromeos::ErrorPtr* error,
+ brillo::ErrorPtr* error,
const std::tuple<std::string, std::string, std::string, std::string,
std::string>& in_request_info,
const std::vector<std::tuple<std::string, std::string>>& in_headers,
@@ -45,7 +45,7 @@
};
bool Server::RequestHandler::ProcessRequest(
- chromeos::ErrorPtr* error,
+ brillo::ErrorPtr* error,
const std::tuple<std::string, std::string, std::string, std::string,
std::string>& in_request_info,
const std::vector<std::tuple<std::string, std::string>>& in_headers,
@@ -61,11 +61,11 @@
ProtocolHandler* protocol_handler =
server_->GetProtocolHandlerByID(protocol_handler_id);
if (!protocol_handler) {
- chromeos::Error::AddToPrintf(error, FROM_HERE,
- chromeos::errors::dbus::kDomain,
- DBUS_ERROR_FAILED,
- "Unknown protocol handler '%s'",
- protocol_handler_id.c_str());
+ brillo::Error::AddToPrintf(error, FROM_HERE,
+ brillo::errors::dbus::kDomain,
+ DBUS_ERROR_FAILED,
+ "Unknown protocol handler '%s'",
+ protocol_handler_id.c_str());
return false;
}
std::unique_ptr<Request> request{new Request{protocol_handler, url, method}};
@@ -113,11 +113,11 @@
void Server::Connect(
const scoped_refptr<dbus::Bus>& bus,
const std::string& service_name,
- const chromeos::dbus_utils::AsyncEventSequencer::CompletionAction& cb,
+ const brillo::dbus_utils::AsyncEventSequencer::CompletionAction& cb,
const base::Closure& on_server_online,
const base::Closure& on_server_offline) {
service_name_ = service_name;
- dbus_object_.reset(new chromeos::dbus_utils::DBusObject{
+ dbus_object_.reset(new brillo::dbus_utils::DBusObject{
nullptr, bus, dbus_adaptor_->GetObjectPath()});
dbus_adaptor_->RegisterWithDBusObject(dbus_object_.get());
dbus_object_->RegisterAsync(cb);
diff --git a/libwebserv/server.h b/libwebserv/server.h
index 70e5dcd..3f3f6be 100644
--- a/libwebserv/server.h
+++ b/libwebserv/server.h
@@ -21,8 +21,8 @@
#include <base/macros.h>
#include <dbus/bus.h>
-#include <chromeos/dbus/async_event_sequencer.h>
-#include <chromeos/dbus/dbus_object.h>
+#include <brillo/dbus/async_event_sequencer.h>
+#include <brillo/dbus/dbus_object.h>
#include <libwebserv/export.h>
#include <libwebserv/request_handler_interface.h>
@@ -59,7 +59,7 @@
void Connect(
const scoped_refptr<dbus::Bus>& bus,
const std::string& service_name,
- const chromeos::dbus_utils::AsyncEventSequencer::CompletionAction& cb,
+ const brillo::dbus_utils::AsyncEventSequencer::CompletionAction& cb,
const base::Closure& on_server_online,
const base::Closure& on_server_offline);
@@ -128,7 +128,7 @@
std::unique_ptr<org::chromium::WebServer::RequestHandlerAdaptor>
dbus_adaptor_;
// D-Bus object to handler registration of RequestHandlerInterface.
- std::unique_ptr<chromeos::dbus_utils::DBusObject> dbus_object_;
+ std::unique_ptr<brillo::dbus_utils::DBusObject> dbus_object_;
// A mapping of protocol handler name to the associated object.
std::map<std::string, std::unique_ptr<ProtocolHandler>>