Use static function to create connected webserver
am: ea01132806
* commit 'ea01132806b239d47e656be2f214253a8f50d590':
Use static function to create connected webserver
diff --git a/buffet/webserv_client.cc b/buffet/webserv_client.cc
index 154bc5f..4a67d75 100644
--- a/buffet/webserv_client.cc
+++ b/buffet/webserv_client.cc
@@ -93,23 +93,20 @@
brillo::dbus_utils::AsyncEventSequencer* sequencer,
const base::Closure& server_available_callback)
: server_available_callback_{server_available_callback} {
- web_server_.reset(new libwebserv::Server);
+ web_server_ = libwebserv::Server::ConnectToServerViaDBus(
+ bus, buffet::dbus_constants::kServiceName,
+ sequencer->GetHandler("Server::Connect failed.", true),
+ base::Bind(&base::DoNothing),
+ base::Bind(&base::DoNothing));
web_server_->OnProtocolHandlerConnected(
base::Bind(&WebServClient::OnProtocolHandlerConnected,
weak_ptr_factory_.GetWeakPtr()));
web_server_->OnProtocolHandlerDisconnected(
base::Bind(&WebServClient::OnProtocolHandlerDisconnected,
weak_ptr_factory_.GetWeakPtr()));
-
- web_server_->Connect(bus, buffet::dbus_constants::kServiceName,
- sequencer->GetHandler("Server::Connect failed.", true),
- base::Bind(&base::DoNothing),
- base::Bind(&base::DoNothing));
}
-WebServClient::~WebServClient() {
- web_server_->Disconnect();
-}
+WebServClient::~WebServClient() {}
void WebServClient::AddHttpRequestHandler(
const std::string& path,