commit beb1c5bef5530a76ad2ae421d8115e54386855d5
author Anton Muhin <antonm@google.com> Thu Oct 16 18:59:57 2014 +0400
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Oct 17 01:13:05 2014 +0000
tree 53c0eb8b1dbac10aa735fe1ada4d0d865d9ab92e
parent 193e1f09538eda502c7a62256cbabca5fc227c44

buffet: Merge registration start and finalization.

As currently user-initiated registration flow is recommended,
it allows us to simplify registration protocol to a single method.

BUG=None
TEST=cros_workon_make buffet --test && manual testing.

Change-Id: I1937b91f4f7b34585ce5b8cb1a4c26ec3a849865
Reviewed-on: https://chromium-review.googlesource.com/223700
Commit-Queue: Anton Muhin <antonm@chromium.org>
Tested-by: Anton Muhin <antonm@chromium.org>
Reviewed-by: Anton Muhin <antonm@chromium.org>

buffet/manager.h

diff --git a/buffet/manager.h b/buffet/manager.h
index 8d7ab13..4fcf445 100644
--- a/buffet/manager.h
+++ b/buffet/manager.h
@@ -49,12 +49,10 @@
   std::string HandleCheckDeviceRegistered(chromeos::ErrorPtr* error);
   // Handles calls to org.chromium.Buffet.Manager.GetDeviceInfo().
   std::string HandleGetDeviceInfo(chromeos::ErrorPtr* error);
-  // Handles calls to org.chromium.Buffet.Manager.StartRegisterDevice().
-  std::string HandleStartRegisterDevice(chromeos::ErrorPtr* error,
-                                        const std::map<std::string,
-                                                       std::string>& params);
-  // Handles calls to org.chromium.Buffet.Manager.FinishRegisterDevice().
-  std::string HandleFinishRegisterDevice(chromeos::ErrorPtr* error);
+  // Handles calls to org.chromium.Buffet.Manager.RegisterDevice().
+  std::string HandleRegisterDevice(
+      chromeos::ErrorPtr* error,
+      const std::map<std::string, std::string>& params);
   // Handles calls to org.chromium.Buffet.Manager.UpdateState().
   void HandleUpdateState(chromeos::ErrorPtr* error,
                          const chromeos::VariantDictionary& property_set);