Cast: Reshuffle files under media/cast

media/cast/net/cast_transport_defines.h

Index: media/cast/net/cast_transport_defines.h
diff --git a/media/cast/transport/cast_transport_defines.h b/media/cast/net/cast_transport_defines.h
similarity index 84%
rename from media/cast/transport/cast_transport_defines.h
rename to media/cast/net/cast_transport_defines.h
index a34f7c539ab8fda9a3f306f8e97d26e9b7a920a2..581433c1620a00097dfaa6b309ae55eef9ed448b 100644
--- a/media/cast/transport/cast_transport_defines.h
+++ b/media/cast/net/cast_transport_defines.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_DEFINES_H_
-#define MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_DEFINES_H_
+#ifndef MEDIA_CAST_NET_CAST_TRANSPORT_DEFINES_H_
+#define MEDIA_CAST_NET_CAST_TRANSPORT_DEFINES_H_
 
 #include <stdint.h>
 
@@ -16,7 +16,6 @@
 
 namespace media {
 namespace cast {
-namespace transport {
 
 // TODO(mikhal): Implement and add more types.
 enum CastTransportStatus {
@@ -35,26 +34,6 @@ typedef std::set<uint16> PacketIdSet;
 // Each uint8 represents one cast frame.
 typedef std::map<uint8, PacketIdSet> MissingFramesAndPacketsMap;
 
-// Crypto.
-const size_t kAesBlockSize = 16;
-const size_t kAesKeySize = 16;
-
-inline std::string GetAesNonce(uint32 frame_id, const std::string& iv_mask) {

[wtc, 2014/07/11 22:31:36]

Why did you delete this function from this header but keep the other inline
function (GetVideoRtpTimestamp)? Just curious.

[Alpha Left Google, 2014/07/12 01:37:55]

This function is used only once in the .cc file that this is moved to.

-  std::string aes_nonce(kAesBlockSize, 0);
-
-  // Serializing frame_id in big-endian order (aes_nonce[8] is the most
-  // significant byte of frame_id).
-  aes_nonce[11] = frame_id & 0xff;
-  aes_nonce[10] = (frame_id >> 8) & 0xff;
-  aes_nonce[9] = (frame_id >> 16) & 0xff;
-  aes_nonce[8] = (frame_id >> 24) & 0xff;
-
-  for (size_t i = 0; i < kAesBlockSize; ++i) {
-    aes_nonce[i] ^= iv_mask[i];
-  }
-  return aes_nonce;
-}
-
 // Rtcp defines.
 
 enum RtcpPacketFields {
@@ -162,8 +141,7 @@ inline uint32 GetVideoRtpTimestamp(const base::TimeTicks& time_ticks) {
   return static_cast<uint32>(recorded_delta.InMilliseconds() * 90);
 }
 
-}  // namespace transport
 }  // namespace cast
 }  // namespace media
 
-#endif  // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_DEFINES_H_
+#endif  // MEDIA_CAST_NET_CAST_TRANSPORT_DEFINES_H_