[EasyUnlock] Fixing the setup connection finder and message format.

components/cryptauth/wire_message_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/cryptauth/wire_message.h"
 
 #include <stdint.h>
 
 #include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 70 matching lines @@
   bool is_incomplete;
   std::string header("\3\0\x15", 3);
   std::string bytes =
       header + "[{\"payload\": \"YQ==\"}]";
   std::unique_ptr<WireMessage> message =
       WireMessage::Deserialize(bytes, &is_incomplete);
   EXPECT_FALSE(is_incomplete);
   EXPECT_FALSE(message);
 }
 
-TEST(CryptAuthWireMessageTest, Deserialize_BodyLacksPayload) {
+TEST(CryptAuthWireMessageTest, Deserialize_NonEncryptedMessage) {
   bool is_incomplete;
   std::string header("\3\0\x02", 3);
   std::string bytes = header + "{}";
   std::unique_ptr<WireMessage> message =
       WireMessage::Deserialize(bytes, &is_incomplete);
   EXPECT_FALSE(is_incomplete);
-  EXPECT_FALSE(message);
+  ASSERT_TRUE(message);
+  EXPECT_EQ("{}", message->body());
 }
 
 TEST(CryptAuthWireMessageTest, Deserialize_BodyHasEmptyPayload) {
   bool is_incomplete;
   std::string header("\3\0\x29", 3);
   std::string bytes = header
       + "{\"payload\": \"\", \"feature\": \"testFeature\"}";
   std::unique_ptr<WireMessage> message =
       WireMessage::Deserialize(bytes, &is_incomplete);
   EXPECT_FALSE(is_incomplete);
@@ skipping 96 matching lines @@
   EXPECT_EQ("easy_unlock", message->feature());
 }
 
 TEST(CryptAuthWireMessageTest, Serialize_FailsWithoutPayload) {
   WireMessage message1(std::string(), "example id");
   std::string bytes = message1.Serialize();
   EXPECT_TRUE(bytes.empty());
 }
 
 }  // namespace cryptauth