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/libbuffet/dbus_constants.h

diff --git a/buffet/libbuffet/dbus_constants.h b/buffet/libbuffet/dbus_constants.h
index 0d0c63b..e0dd22a 100644
--- a/buffet/libbuffet/dbus_constants.h
+++ b/buffet/libbuffet/dbus_constants.h
@@ -25,8 +25,7 @@
 LIBBUFFET_EXPORT extern const char kManagerStartDevice[];
 LIBBUFFET_EXPORT extern const char kManagerCheckDeviceRegistered[];
 LIBBUFFET_EXPORT extern const char kManagerGetDeviceInfo[];
-LIBBUFFET_EXPORT extern const char kManagerStartRegisterDevice[];
-LIBBUFFET_EXPORT extern const char kManagerFinishRegisterDevice[];
+LIBBUFFET_EXPORT extern const char kManagerRegisterDevice[];
 LIBBUFFET_EXPORT extern const char kManagerUpdateStateMethod[];
 LIBBUFFET_EXPORT extern const char kManagerAddCommand[];
 LIBBUFFET_EXPORT extern const char kManagerTestMethod[];