Cast: Reshuffle files under media/cast

media/cast/net/udp_transport_unittest.cc

Index: media/cast/net/udp_transport_unittest.cc
diff --git a/media/cast/transport/transport/udp_transport_unittest.cc b/media/cast/net/udp_transport_unittest.cc
similarity index 88%
rename from media/cast/transport/transport/udp_transport_unittest.cc
rename to media/cast/net/udp_transport_unittest.cc
index 26879492f05f824d44c45bff40c9ebe64f69f634..e80ec6d0cfc9205d1436f58fe26461e51b53cf18 100644
--- a/media/cast/transport/transport/udp_transport_unittest.cc
+++ b/media/cast/net/udp_transport_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/cast/transport/transport/udp_transport.h"
+#include "media/cast/net/udp_transport.h"
 
 #include <algorithm>
 #include <string>
@@ -12,14 +12,13 @@
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "media/cast/net/cast_transport_config.h"
 #include "media/cast/test/utility/net_utility.h"
-#include "media/cast/transport/cast_transport_config.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 namespace cast {
-namespace transport {
 
 class MockPacketReceiver {
  public:
@@ -33,7 +32,7 @@ class MockPacketReceiver {
   }
 
   std::string packet() const { return packet_; }
-  transport::PacketReceiverCallback packet_receiver() {
+  PacketReceiverCallback packet_receiver() {
     return base::Bind(&MockPacketReceiver::ReceivedPacket,
                       base::Unretained(this));
   }
@@ -50,7 +49,7 @@ void SendPacket(UdpTransport* transport, Packet packet) {
   transport->SendPacket(new base::RefCountedData<Packet>(packet), cb);
 }
 
-static void UpdateCastTransportStatus(transport::CastTransportStatus status) {
+static void UpdateCastTransportStatus(CastTransportStatus status) {
   NOTREACHED();
 }
 
@@ -60,7 +59,7 @@ TEST(UdpTransport, SendAndReceive) {
   net::IPEndPoint free_local_port1 = test::GetFreeLocalPort();
   net::IPEndPoint free_local_port2 = test::GetFreeLocalPort();
   net::IPAddressNumber empty_addr_number;
-  net::ParseIPLiteralToNumber("0.0.0.0", &empty_addr_number);
+  empty_addr_number.resize(4);

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

Please undo this change. I found that many other files outside src/net call
ParseIPLiteralToNumber. I wrote a CL to mark this function NET_EXPORT:
https://codereview.chromium.org/385943004/

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

Done.

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

Done.

 
   UdpTransport send_transport(NULL,
                               message_loop.message_loop_proxy(),
@@ -95,6 +94,5 @@ TEST(UdpTransport, SendAndReceive) {
       std::equal(packet.begin(), packet.end(), receiver2.packet().begin()));
 }
 
-}  // namespace transport
 }  // namespace cast
 }  // namespace media