[CrOS Tether] Create MessageWrapper, a wrapper class for proto messages sent for tethering. This cl…

chromeos/components/tether/message_wrapper.cc

Index: chromeos/components/tether/message_wrapper.cc
diff --git a/chromeos/components/tether/message_wrapper.cc b/chromeos/components/tether/message_wrapper.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1cc8b4397bbcc9a6774dde6ecad8ad1a9b7590a5
--- /dev/null
+++ b/chromeos/components/tether/message_wrapper.cc
@@ -0,0 +1,168 @@
+// 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 "base/base64url.h"
+#include "base/json/json_reader.h"
+#include "base/json/json_writer.h"
+#include "base/logging.h"
+#include "base/memory/ptr_util.h"
+#include "base/values.h"
+
+namespace chromeos {
+
+namespace tether {
+
+namespace {
+
+const char kJsonTypeKey[] = "type";
+const char kJsonDataKey[] = "data";
+
+std::unique_ptr<google::protobuf::MessageLite> DecodedMessageToProto(

[Ryan Hansberry, 2017/02/17 02:29:07]

Why is this not a private method of MessageWrapper?

[Kyle Horimoto, 2017/02/17 20:05:03]

It does not reference any instance variables of MessageWrapper, so it is better
encapsulated as a static function in an anonymous namespace.

+    const MessageType& type,
+    const std::string& decoded_message) {
+  switch (type) {
+    case MessageType::CONNECT_TETHERING_REQUEST: {
+      std::unique_ptr<ConnectTetheringRequest> connect_request =
+          base::MakeUnique<ConnectTetheringRequest>();
+      connect_request->ParseFromString(decoded_message);
+      return connect_request;
+    }
+    case MessageType::CONNECT_TETHERING_RESPONSE: {
+      std::unique_ptr<ConnectTetheringResponse> connect_response =
+          base::MakeUnique<ConnectTetheringResponse>();
+      connect_response->ParseFromString(decoded_message);
+      return connect_response;
+    }
+    case MessageType::DISCONNECT_TETHERING_REQUEST: {
+      std::unique_ptr<DisconnectTetheringRequest> disconnect_request =
+          base::MakeUnique<DisconnectTetheringRequest>();
+      disconnect_request->ParseFromString(decoded_message);
+      return disconnect_request;
+    }
+    case MessageType::KEEP_ALIVE_TICKLE: {
+      std::unique_ptr<KeepAliveTickle> keep_alive_tickle =
+          base::MakeUnique<KeepAliveTickle>();
+      keep_alive_tickle->ParseFromString(decoded_message);
+      return keep_alive_tickle;
+    }
+    case MessageType::TETHER_AVAILABILITY_REQUEST: {
+      std::unique_ptr<TetherAvailabilityRequest> tether_request =
+          base::MakeUnique<TetherAvailabilityRequest>();
+      tether_request->ParseFromString(decoded_message);
+      return tether_request;
+    }
+    case MessageType::TETHER_AVAILABILITY_RESPONSE: {
+      std::unique_ptr<TetherAvailabilityResponse> tether_response =
+          base::MakeUnique<TetherAvailabilityResponse>();
+      tether_response->ParseFromString(decoded_message);
+      return tether_response;
+    }
+    default:
+      return nullptr;
+  }
+}
+
+}  // namespace
+
+// static
+std::unique_ptr<MessageWrapper> MessageWrapper::FromRawMessage(
+    const std::string& message) {
+  std::unique_ptr<base::Value> json_value = base::JSONReader::Read(message);
+  if (!json_value) {
+    return nullptr;
+  }
+
+  std::unique_ptr<base::DictionaryValue> json_dictionary =
+      base::DictionaryValue::From(std::move(json_value));
+  if (!json_dictionary) {
+    return nullptr;
+  }
+
+  int message_type;
+  if (!json_dictionary->GetInteger(kJsonTypeKey, &message_type)) {
+    return nullptr;
+  }
+
+  std::string encoded_message;
+  if (!json_dictionary->GetString(kJsonDataKey, &encoded_message)) {
+    return nullptr;
+  }
+
+  std::string decoded_message;
+  if (!base::Base64UrlDecode(encoded_message,
+                             base::Base64UrlDecodePolicy::REQUIRE_PADDING,
+                             &decoded_message)) {
+    return nullptr;
+  }
+
+  std::unique_ptr<google::protobuf::MessageLite> proto = DecodedMessageToProto(
+      static_cast<MessageType>(message_type), decoded_message);
+  if (!proto) {
+    return nullptr;
+  }
+
+  return base::WrapUnique(new MessageWrapper(
+      static_cast<MessageType>(message_type), std::move(proto)));
+}
+
+MessageWrapper::MessageWrapper(const ConnectTetheringRequest& request)
+    : type_(MessageType::CONNECT_TETHERING_REQUEST),
+      proto_(new ConnectTetheringRequest(request)) {}
+
+MessageWrapper::MessageWrapper(const ConnectTetheringResponse& response)
+    : type_(MessageType::CONNECT_TETHERING_RESPONSE),
+      proto_(new ConnectTetheringResponse(response)) {}
+
+MessageWrapper::MessageWrapper(const DisconnectTetheringRequest& request)
+    : type_(MessageType::DISCONNECT_TETHERING_REQUEST),
+      proto_(new DisconnectTetheringRequest(request)) {}
+
+MessageWrapper::MessageWrapper(const KeepAliveTickle& tickle)
+    : type_(MessageType::KEEP_ALIVE_TICKLE),
+      proto_(new KeepAliveTickle(tickle)) {}
+
+MessageWrapper::MessageWrapper(const TetherAvailabilityRequest& request)
+    : type_(MessageType::TETHER_AVAILABILITY_REQUEST),
+      proto_(new TetherAvailabilityRequest(request)) {}
+
+MessageWrapper::MessageWrapper(const TetherAvailabilityResponse& response)
+    : type_(MessageType::TETHER_AVAILABILITY_RESPONSE),
+      proto_(new TetherAvailabilityResponse(response)) {}
+
+MessageWrapper::MessageWrapper(
+    const MessageType& type,
+    std::shared_ptr<google::protobuf::MessageLite> proto)
+    : type_(type), proto_(proto) {}
+
+MessageWrapper::~MessageWrapper() {}
+
+std::shared_ptr<google::protobuf::MessageLite> MessageWrapper::GetProto()
+    const {
+  return proto_;
+}
+
+MessageType MessageWrapper::GetMessageType() const {
+  return type_;
+}
+
+std::string MessageWrapper::ToRawMessage() const {
+  std::string encoded_message;
+  base::Base64UrlEncode(proto_->SerializeAsString(),
+                        base::Base64UrlEncodePolicy::INCLUDE_PADDING,
+                        &encoded_message);
+
+  base::DictionaryValue json_dictionary;
+  json_dictionary.SetInteger(kJsonTypeKey, static_cast<int>(type_));
+  json_dictionary.SetString(kJsonDataKey, encoded_message);
+
+  std::string raw_message;
+  base::JSONWriter::Write(json_dictionary, &raw_message);
+  return raw_message;
+}
+
+}  // namespace tether
+
+}  // namespace chromeos