commit 7ad8ffbb1537df726f5cb47065a7c1201586ce4a
author Vitaly Buka <vitalybuka@chromium.org> Fri Mar 20 09:46:57 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Sat Mar 21 01:48:00 2015 +0000
tree 4ac8064af2ee103c51eb04605d104e3441a978d0
parent 620bd7efcb43e7ff4ce3e804faed2f4a7899abe6

buffet: Remove initial OnRegistrationStatusChanged call

This call was neccecary because DeviceRegistrationInfo calls callback only
if values actually changed, skipping callback for intial value. We still need to
call callback there too. Solved by additional stus change in Load().

Also some reformating and renames.

BUG=brillo:592
TEST=covered by buffet_Registration

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

buffet/manager.cc

diff --git a/buffet/manager.cc b/buffet/manager.cc
index 53ec9c9..0855384 100644
--- a/buffet/manager.cc
+++ b/buffet/manager.cc
@@ -39,15 +39,16 @@
 Manager::Manager(const base::WeakPtr<ExportedObjectManager>& object_manager)
     : dbus_object_(object_manager.get(),
                    object_manager->GetBus(),
-                   org::chromium::Buffet::ManagerAdaptor::GetObjectPath()) {}
+                   org::chromium::Buffet::ManagerAdaptor::GetObjectPath()) {
+}
 
-Manager::~Manager() {}
+Manager::~Manager() {
+}
 
-void Manager::RegisterAsync(
-    const base::FilePath& config_path,
-    const base::FilePath& state_path,
-    const base::FilePath& test_definitions_path,
-    const AsyncEventSequencer::CompletionAction& cb) {
+void Manager::RegisterAsync(const base::FilePath& config_path,
+                            const base::FilePath& state_path,
+                            const base::FilePath& test_definitions_path,
+                            const AsyncEventSequencer::CompletionAction& cb) {
   command_manager_ =
       std::make_shared<CommandManager>(dbus_object_.GetObjectManager());
   command_manager_->Startup(base::FilePath{"/etc/buffet"},
@@ -69,10 +70,8 @@
           std::move(config_store),
           chromeos::http::Transport::CreateDefault(),
           std::move(state_store),
-          base::Bind(&Manager::OnRegistrationStatusChange,
+          base::Bind(&Manager::OnRegistrationStatusChanged,
                      base::Unretained(this))));
-  // Reset D-Bus properties.
-  OnRegistrationStatusChange();
   device_info_->Load();
   dbus_adaptor_.RegisterWithDBusObject(&dbus_object_);
   dbus_object_.RegisterAsync(cb);
@@ -121,8 +120,8 @@
                                "String value expected");
       return;
     }
-    str_params.emplace_hint(str_params.end(),
-                            pair.first, pair.second.Get<std::string>());
+    str_params.emplace_hint(str_params.end(), pair.first,
+                            pair.second.Get<std::string>());
   }
   std::string device_id = device_info_->RegisterDevice(str_params, &error);
   if (!device_id.empty()) {
@@ -132,8 +131,7 @@
   if (!error) {
     // TODO(zeuthen): This can be changed to CHECK(error) once
     // RegisterDevice() has been fixed to set |error| when failing.
-    chromeos::Error::AddTo(&error, FROM_HERE, kErrorDomainGCD,
-                           "internal_error",
+    chromeos::Error::AddTo(&error, FROM_HERE, kErrorDomainGCD, "internal_error",
                            "device_id empty but error not set");
   }
   response->ReplyWithError(error.get());
@@ -145,8 +143,8 @@
   base::Time timestamp = base::Time::Now();
   bool all_success = true;
   for (const auto& pair : property_set) {
-    if (!state_manager_->SetPropertyValue(pair.first, pair.second,
-                                          timestamp, &error)) {
+    if (!state_manager_->SetPropertyValue(pair.first, pair.second, timestamp,
+                                          &error)) {
       // Remember that an error occurred but keep going and update the rest of
       // the properties if possible.
       all_success = false;
@@ -195,7 +193,7 @@
   return message;
 }
 
-void Manager::OnRegistrationStatusChange() {
+void Manager::OnRegistrationStatusChanged() {
   dbus_adaptor_.SetStatus(
       StatusToString(device_info_->GetRegistrationStatus()));
   dbus_adaptor_.SetDeviceId(device_info_->GetDeviceId());