commit b624bc47fb70294185478e4c758657a54b859cb1
author Vitaly Buka <vitalybuka@google.com> Tue Sep 29 19:13:55 2015 -0700
committer Vitaly Buka <vitalybuka@google.com> Wed Sep 30 02:21:38 2015 +0000
tree 3e2be834e2447a94769c31ee3097ac120623e912
parent 41a90d69918c6367ba23de1edf0bad6c7175f3b9

Use enum for Settings::local_anonymous_access_role

BUG:24267885
Change-Id: I406ed545f11be20177b9d38b3ea6fef9ded9a566
Reviewed-on: https://weave-review.googlesource.com/1200
Reviewed-by: Vitaly Buka <vitalybuka@google.com>

libweave/src/privet/mock_delegates.h

diff --git a/libweave/src/privet/mock_delegates.h b/libweave/src/privet/mock_delegates.h
index eb4bd6e..1944fbb 100644
--- a/libweave/src/privet/mock_delegates.h
+++ b/libweave/src/privet/mock_delegates.h
@@ -141,12 +141,10 @@
   MOCK_CONST_METHOD0(GetName, std::string());
   MOCK_CONST_METHOD0(GetDescription, std::string());
   MOCK_CONST_METHOD0(GetLocation, std::string());
-  MOCK_METHOD5(UpdateDeviceInfo,
+  MOCK_METHOD3(UpdateDeviceInfo,
                void(const std::string&,
                     const std::string&,
-                    const std::string&,
-                    const SuccessCallback&,
-                    const ErrorCallback&));
+                    const std::string&));
   MOCK_CONST_METHOD0(GetOemName, std::string());
   MOCK_CONST_METHOD0(GetModelName, std::string());
   MOCK_CONST_METHOD0(GetServices, std::set<std::string>());
@@ -182,8 +180,7 @@
     EXPECT_CALL(*this, GetName()).WillRepeatedly(Return("TestDevice"));
     EXPECT_CALL(*this, GetDescription()).WillRepeatedly(Return(""));
     EXPECT_CALL(*this, GetLocation()).WillRepeatedly(Return(""));
-    EXPECT_CALL(*this, UpdateDeviceInfo(_, _, _, _, _))
-        .WillRepeatedly(RunCallback<3>());
+    EXPECT_CALL(*this, UpdateDeviceInfo(_, _, _)).WillRepeatedly(Return());
     EXPECT_CALL(*this, GetOemName()).WillRepeatedly(Return("Chromium"));
     EXPECT_CALL(*this, GetModelName()).WillRepeatedly(Return("Brillo"));
     EXPECT_CALL(*this, GetServices())