commit 7ab89ff4f261448a6ea406536ca72d32a72e1b8a
author Vitaly Buka <vitalybuka@chromium.org> Tue Jun 09 22:11:40 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Tue Jun 16 04:26:18 2015 +0000
tree bff83f837e6b5138074bb08e83f712e76b925427
parent ae96cc31d9977f57c1737e45e60067d5ec57ee84

buffet: Remove D-Bus between CloudDelegate and Buffet

Now code runs in the same process so no need in IPC.

BUG=brillo:1161
TEST=`FEATURES=test emerge-gizmo buffet`

Change-Id: Ia23551b335cae9051948b62b6e15a2d2e3d4d106
Reviewed-on: https://chromium-review.googlesource.com/276603
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Vitaly Buka <vitalybuka@chromium.org>
Tested-by: Vitaly Buka <vitalybuka@chromium.org>

buffet/privet/privet_manager.cc

diff --git a/buffet/privet/privet_manager.cc b/buffet/privet/privet_manager.cc
index 1471404..28971ae 100644
--- a/buffet/privet/privet_manager.cc
+++ b/buffet/privet/privet_manager.cc
@@ -27,6 +27,7 @@
 #include <libwebserv/response.h>
 #include <libwebserv/server.h>
 
+#include "buffet/dbus_constants.h"
 #include "buffet/privet/ap_manager_client.h"
 #include "buffet/privet/cloud_delegate.h"
 #include "buffet/privet/constants.h"
@@ -38,7 +39,6 @@
 #include "buffet/privet/security_manager.h"
 #include "buffet/privet/shill_client.h"
 #include "buffet/privet/wifi_bootstrap_manager.h"
-#include "buffet/dbus_constants.h"
 
 namespace privetd {
 
@@ -67,6 +67,9 @@
 
 void Manager::Start(const Options& options,
                     const scoped_refptr<dbus::Bus>& bus,
+                    buffet::DeviceRegistrationInfo* device,
+                    buffet::CommandManager* command_manager,
+                    buffet::StateManager* state_manager,
                     AsyncEventSequencer* sequencer) {
   disable_security_ = options.disable_security;
 
@@ -99,8 +102,9 @@
     device_whitelist.insert(interfaces.begin(), interfaces.end());
   }
   device_ = DeviceDelegate::CreateDefault();
-  cloud_ = CloudDelegate::CreateDefault(parser_->gcd_bootstrap_mode() !=
-                                        GcdBootstrapMode::kDisabled);
+  cloud_ = CloudDelegate::CreateDefault(
+      parser_->gcd_bootstrap_mode() != GcdBootstrapMode::kDisabled, device,
+      command_manager, state_manager);
   cloud_observer_.Add(cloud_.get());
   security_.reset(new SecurityManager(parser_->pairing_modes(),
                                       parser_->embedded_code_path(),
@@ -162,7 +166,7 @@
 
 void Manager::OnDeviceInfoChanged() {
   OnChanged();
-};
+}
 
 void Manager::PrivetRequestHandler(std::unique_ptr<Request> request,
                                    std::unique_ptr<Response> response) {