Cast: Reshuffle files under media/cast

media/cast/net/cast_transport_config.h

 // 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.
 
-#ifndef MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_
-#define MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_
+#ifndef MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_
+#define MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
-#include "media/cast/transport/cast_transport_defines.h"
+#include "media/cast/net/cast_transport_defines.h"
 #include "net/base/ip_endpoint.h"

[wtc, 2014/07/12 03:09:09]

Remove this line. I didn't find any "net::" in this file.

[Alpha Left Google, 2014/07/14 18:44:31]

Done.

[Alpha Left Google, 2014/07/14 18:44:31]

Done.

 
 namespace media {
 namespace cast {
-namespace transport {
 
 enum RtcpMode {
   kRtcpCompound,     // Compound RTCP mode is described by RFC 4585.
   kRtcpReducedSize,  // Reduced-size RTCP mode is described by RFC 5506.
 };
 
 enum Codec {
   CODEC_UNKNOWN,
   CODEC_AUDIO_OPUS,
   CODEC_AUDIO_PCM16,
@@ skipping 156 matching lines @@
 };
 
 inline bool operator==(RtcpSenderInfo lhs, RtcpSenderInfo rhs) {
   return lhs.ntp_seconds == rhs.ntp_seconds &&
          lhs.ntp_fraction == rhs.ntp_fraction &&
          lhs.rtp_timestamp == rhs.rtp_timestamp &&
          lhs.send_packet_count == rhs.send_packet_count &&
          lhs.send_octet_count == rhs.send_octet_count;
 }
 
-}  // namespace transport
 }  // namespace cast
 }  // namespace media
 
-#endif  // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_
+#endif  // MEDIA_CAST_NET_CAST_TRANSPORT_CONFIG_H_