Index: components/cast_channel/cast_message_util.cc |
diff --git a/extensions/browser/api/cast_channel/cast_message_util.cc b/components/cast_channel/cast_message_util.cc |
similarity index 50% |
copy from extensions/browser/api/cast_channel/cast_message_util.cc |
copy to components/cast_channel/cast_message_util.cc |
index 3b646610642902fc7ba7822bda2b45e6ed72bd87..50c4be1c858f223848cddf5774ab592109db5380 100644 |
--- a/extensions/browser/api/cast_channel/cast_message_util.cc |
+++ b/components/cast_channel/cast_message_util.cc |
@@ -2,64 +2,25 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "extensions/browser/api/cast_channel/cast_message_util.h" |
+#include "components/cast_channel/cast_message_util.h" |
#include <memory> |
#include "base/logging.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/values.h" |
-#include "extensions/browser/api/cast_channel/cast_auth_util.h" |
-#include "extensions/common/api/cast_channel.h" |
-#include "extensions/common/api/cast_channel/cast_channel.pb.h" |
+#include "components/cast_channel/cast_auth_util.h" |
+#include "components/cast_channel/proto/cast_channel.pb.h" |
namespace { |
-static const char kAuthNamespace[] = |
- "urn:x-cast:com.google.cast.tp.deviceauth"; |
+static const char kAuthNamespace[] = "urn:x-cast:com.google.cast.tp.deviceauth"; |
// Sender and receiver IDs to use for platform messages. |
static const char kPlatformSenderId[] = "sender-0"; |
static const char kPlatformReceiverId[] = "receiver-0"; |
} // namespace |
-namespace extensions { |
-namespace api { |
namespace cast_channel { |
-bool MessageInfoToCastMessage(const MessageInfo& message, |
- CastMessage* message_proto) { |
- DCHECK(message_proto); |
- if (!message.data) |
- return false; |
- |
- message_proto->set_protocol_version(CastMessage_ProtocolVersion_CASTV2_1_0); |
- message_proto->set_source_id(message.source_id); |
- message_proto->set_destination_id(message.destination_id); |
- message_proto->set_namespace_(message.namespace_); |
- // Determine the type of the base::Value and set the message payload |
- // appropriately. |
- std::string data; |
- switch (message.data->GetType()) { |
- // JS string |
- case base::Value::Type::STRING: |
- if (message.data->GetAsString(&data)) { |
- message_proto->set_payload_type(CastMessage_PayloadType_STRING); |
- message_proto->set_payload_utf8(data); |
- } |
- break; |
- // JS ArrayBuffer |
- case base::Value::Type::BINARY: |
- message_proto->set_payload_type(CastMessage_PayloadType_BINARY); |
- message_proto->set_payload_binary(message.data->GetBlob().data(), |
- message.data->GetBlob().size()); |
- break; |
- default: |
- // Unknown value type. message_proto will remain uninitialized because |
- // payload_type is unset. |
- break; |
- } |
- return message_proto->IsInitialized(); |
-} |
- |
bool IsCastMessageValid(const CastMessage& message_proto) { |
if (message_proto.namespace_().empty() || message_proto.source_id().empty() || |
message_proto.destination_id().empty()) { |
@@ -71,38 +32,6 @@ bool IsCastMessageValid(const CastMessage& message_proto) { |
message_proto.has_payload_binary()); |
} |
-bool CastMessageToMessageInfo(const CastMessage& message_proto, |
- MessageInfo* message) { |
- DCHECK(message); |
- message->source_id = message_proto.source_id(); |
- message->destination_id = message_proto.destination_id(); |
- message->namespace_ = message_proto.namespace_(); |
- // Determine the type of the payload and fill base::Value appropriately. |
- std::unique_ptr<base::Value> value; |
- switch (message_proto.payload_type()) { |
- case CastMessage_PayloadType_STRING: |
- if (message_proto.has_payload_utf8()) |
- value.reset(new base::Value(message_proto.payload_utf8())); |
- break; |
- case CastMessage_PayloadType_BINARY: |
- if (message_proto.has_payload_binary()) |
- value = base::Value::CreateWithCopiedBuffer( |
- message_proto.payload_binary().data(), |
- message_proto.payload_binary().size()); |
- break; |
- default: |
- // Unknown payload type. value will remain unset. |
- break; |
- } |
- if (value.get()) { |
- DCHECK(!message->data.get()); |
- message->data = std::move(value); |
- return true; |
- } else { |
- return false; |
- } |
-} |
- |
std::string CastMessageToString(const CastMessage& message_proto) { |
std::string out("{"); |
out += "namespace = " + message_proto.namespace_(); |
@@ -156,5 +85,3 @@ bool IsAuthMessage(const CastMessage& message) { |
} |
} // namespace cast_channel |
-} // namespace api |
-} // namespace extensions |