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/privet_handler_unittest.cc

diff --git a/libweave/src/privet/privet_handler_unittest.cc b/libweave/src/privet/privet_handler_unittest.cc
index 7f79934..001ac3d 100644
--- a/libweave/src/privet/privet_handler_unittest.cc
+++ b/libweave/src/privet/privet_handler_unittest.cc
@@ -124,8 +124,7 @@
  protected:
   void SetUp() override {
     auth_header_ = "Privet anonymous";
-    handler_.reset(
-        new PrivetHandler(&cloud_, &device_, &security_, &wifi_, &identity_));
+    handler_.reset(new PrivetHandler(&cloud_, &device_, &security_, &wifi_));
   }
 
   const base::DictionaryValue& HandleRequest(
@@ -153,8 +152,7 @@
   }
 
   void SetNoWifiAndGcd() {
-    handler_.reset(
-        new PrivetHandler(&cloud_, &device_, &security_, nullptr, &identity_));
+    handler_.reset(new PrivetHandler(&cloud_, &device_, &security_, nullptr));
     EXPECT_CALL(cloud_, GetCloudId()).WillRepeatedly(Return(""));
     EXPECT_CALL(cloud_, GetConnectionState())
         .WillRepeatedly(ReturnRef(gcd_disabled_state_));
@@ -170,7 +168,6 @@
   testing::StrictMock<MockDeviceDelegate> device_;
   testing::StrictMock<MockSecurityDelegate> security_;
   testing::StrictMock<MockWifiDelegate> wifi_;
-  testing::StrictMock<MockIdentityDelegate> identity_;
   std::string auth_header_;
 
  private: