commit 0b7bb9f1484126e098d0c2a295d4213583005b19
author Johan Euphrosine <proppy@google.com> Tue Sep 29 01:11:21 2015 -0700
committer Vitaly Buka <vitalybuka@google.com> Thu Oct 01 18:11:29 2015 +0000
tree 65eaf3aac66aaefd9fb608ea4e7c3a9f7a5c3239
parent 994bdf3a633711b674aebaae21c5a54063cd7303

weave/settings: add device_id with persisted guid

Bug: 24485657
Change-Id: Iad88280c83c962a4843f3d4def8ef64767303197
Reviewed-on: https://weave-review.googlesource.com/1181
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 1944fbb..20f6877 100644
--- a/libweave/src/privet/mock_delegates.h
+++ b/libweave/src/privet/mock_delegates.h
@@ -15,7 +15,6 @@
 
 #include "src/privet/cloud_delegate.h"
 #include "src/privet/device_delegate.h"
-#include "src/privet/identity_delegate.h"
 #include "src/privet/security_delegate.h"
 #include "src/privet/wifi_delegate.h"
 
@@ -137,6 +136,7 @@
 
 class MockCloudDelegate : public CloudDelegate {
  public:
+  MOCK_CONST_METHOD0(GetDeviceId, std::string());
   MOCK_CONST_METHOD0(GetModelId, std::string());
   MOCK_CONST_METHOD0(GetName, std::string());
   MOCK_CONST_METHOD0(GetDescription, std::string());
@@ -176,6 +176,7 @@
                     const ErrorCallback&));
 
   MockCloudDelegate() {
+    EXPECT_CALL(*this, GetDeviceId()).WillRepeatedly(Return("TestId"));
     EXPECT_CALL(*this, GetModelId()).WillRepeatedly(Return("ABMID"));
     EXPECT_CALL(*this, GetName()).WillRepeatedly(Return("TestDevice"));
     EXPECT_CALL(*this, GetDescription()).WillRepeatedly(Return(""));
@@ -201,15 +202,6 @@
   base::DictionaryValue test_dict_;
 };
 
-class MockIdentityDelegate : public IdentityDelegate {
- public:
-  MOCK_CONST_METHOD0(GetId, std::string());
-
-  MockIdentityDelegate() {
-    EXPECT_CALL(*this, GetId()).WillRepeatedly(Return("TestId"));
-  }
-};
-
 }  // namespace privet
 }  // namespace weave