[CrOS Tether] Create proto_test_util.cc/h and move CreateTestDeviceStatus() there.

chromeos/components/tether/message_wrapper_unittest.cc

 // Copyright 2017 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 "chromeos/components/tether/message_wrapper.h"
 
 #include <sstream>
 
 #include "base/base64url.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "chromeos/components/tether/proto/tether.pb.h"
+#include "chromeos/components/tether/proto_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 namespace tether {
 
 namespace {
 
-DeviceStatus CreateFakeDeviceStatus() {
-  WifiStatus wifi_status;
-  wifi_status.set_status_code(
-      WifiStatus_StatusCode::WifiStatus_StatusCode_CONNECTED);
-  wifi_status.set_ssid("Google A");
-
-  DeviceStatus device_status;
-  device_status.set_battery_percentage(75);
-  device_status.set_cell_provider("Google Fi");
-  device_status.set_connection_strength(4);
-  device_status.mutable_wifi_status()->CopyFrom(wifi_status);
-
-  return device_status;
-}
-
 TetherAvailabilityResponse CreateTetherAvailabilityResponse() {
   TetherAvailabilityResponse response;
   response.set_response_code(
       TetherAvailabilityResponse_ResponseCode::
           TetherAvailabilityResponse_ResponseCode_TETHER_AVAILABLE);
-  response.mutable_device_status()->CopyFrom(CreateFakeDeviceStatus());
+  response.mutable_device_status()->CopyFrom(
+      CreateDeviceStatusWithFakeFields());
   return response;
 }
 
 void VerifyProtoConversion(const google::protobuf::MessageLite* proto,
                            const MessageWrapper& wrapper,
                            const MessageType& expected_message_type) {
   std::string raw_message = wrapper.ToRawMessage();
   EXPECT_TRUE(raw_message.length() > 0);
 
   std::unique_ptr<MessageWrapper> wrapper_from_raw_message =
@@ skipping 21 matching lines @@
   VerifyProtoConversion(&request, wrapper,
                         MessageType::CONNECT_TETHERING_REQUEST);
 }
 
 TEST_F(MessageWrapperTest, TestToAndFromRawMessage_ConnectTetheringResponse) {
   ConnectTetheringResponse response;
   response.set_ssid("Instant Tethering 123456");
   response.set_password("password");
   response.set_response_code(ConnectTetheringResponse_ResponseCode::
                                  ConnectTetheringResponse_ResponseCode_SUCCESS);
-  response.mutable_device_status()->CopyFrom(CreateFakeDeviceStatus());
+  response.mutable_device_status()->CopyFrom(
+      CreateDeviceStatusWithFakeFields());
 
   MessageWrapper wrapper(response);
   VerifyProtoConversion(&response, wrapper,
                         MessageType::CONNECT_TETHERING_RESPONSE);
 }
 
 TEST_F(MessageWrapperTest, TestToAndFromRawMessage_DisconnectTetheringRequest) {
   DisconnectTetheringRequest request;
 
   MessageWrapper wrapper(request);
@@ skipping 66 matching lines @@
      << response.SerializeAsString()  // Do not convert to base-64.
      << "\"}";
 
   EXPECT_FALSE(MessageWrapper::FromRawMessage(ss.str()));
 }
 
 TEST_F(MessageWrapperTest, TestFromRawMessage_StringLiteral) {
   // Type 2 is TETHER_AVAILABILITY_RESPONSE, and the data supplied is
   // CreateTetherAvailabilityResponse() encoded in base-64.
   std::string raw_message =
-      "{\"type\":2,\"data\":\"CAESHQhLEglHb29nbGUgRmkYBCIMCAESCEdvb2dsZSBB\"}";
+      "{\"type\":2,\"data\":\"CAESHQhLEglHb29nbGUgRmkYBCIMCAESCFdpZmlTc2lk\"}";
 
   std::unique_ptr<MessageWrapper> wrapper =
       MessageWrapper::FromRawMessage(raw_message);
   EXPECT_TRUE(wrapper);
   EXPECT_EQ(MessageType::TETHER_AVAILABILITY_RESPONSE,
             wrapper->GetMessageType());
   EXPECT_EQ(CreateTetherAvailabilityResponse().SerializeAsString(),
             wrapper->GetProto()->SerializeAsString());
 }
 
@@ skipping 15 matching lines @@
   EXPECT_TRUE(wrapper);
   EXPECT_EQ(MessageType::TETHER_AVAILABILITY_RESPONSE,
             wrapper->GetMessageType());
   EXPECT_EQ(response.SerializeAsString(),
             wrapper->GetProto()->SerializeAsString());
 }
 
 }  // namespace tether
 
 }  // namespace cryptauth