Move //mojo/services/network/public/interfaces to //mojo/services/network/interfaces.

mojo/services/network/udp_socket_wrapper.cc

Index: mojo/services/network/udp_socket_wrapper.cc
diff --git a/mojo/services/network/public/cpp/udp_socket_wrapper.cc b/mojo/services/network/udp_socket_wrapper.cc
similarity index 95%
rename from mojo/services/network/public/cpp/udp_socket_wrapper.cc
rename to mojo/services/network/udp_socket_wrapper.cc
index 10a1f138222f29258c72b814abca28f7da16f1a1..8dde49d9bfc7b62a6f5280492d5700e1322354d0 100644
--- a/mojo/services/network/public/cpp/udp_socket_wrapper.cc
+++ b/mojo/services/network/udp_socket_wrapper.cc
@@ -2,11 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "network/public/cpp/udp_socket_wrapper.h"
+#include "mojo/services/network/udp_socket_wrapper.h"
 
-#include <assert.h>
-
-#include "third_party/mojo/src/mojo/public/cpp/environment/logging.h"
+#include "base/logging.h"
 
 namespace mojo {
 namespace {
@@ -152,7 +150,7 @@ void UDPSocketWrapper::SendTo(NetAddressPtr dest_addr,
     return;
   }
 
-  MOJO_DCHECK(send_requests_.empty());
+  DCHECK(send_requests_.empty());
   current_pending_sends_++;
   socket_->SendTo(dest_addr.Pass(), data.Pass(),
                   ErrorCallback(static_cast<ErrorCallback::Runnable*>(
@@ -164,7 +162,7 @@ void UDPSocketWrapper::OnReceived(NetworkErrorPtr result,
                                   Array<uint8_t> data) {
   if (!receive_requests_.empty()) {
     // The cache should be empty if there are user requests waiting for data.
-    MOJO_DCHECK(receive_queue_.empty());
+    DCHECK(receive_queue_.empty());
 
     socket_->ReceiveMore(1);
 
@@ -175,7 +173,7 @@ void UDPSocketWrapper::OnReceived(NetworkErrorPtr result,
     return;
   }
 
-  MOJO_DCHECK(receive_queue_.size() < max_receive_queue_size_);
+  DCHECK_LT(receive_queue_.size(), max_receive_queue_size_);
   ReceivedData* received_data = new ReceivedData();
   received_data->result = result.Pass();
   received_data->src_addr = src_addr.Pass();
@@ -193,10 +191,10 @@ void UDPSocketWrapper::Initialize(uint32_t requested_max_pending_sends) {
 
 void UDPSocketWrapper::OnNegotiateMaxPendingSendRequestsCompleted(
     uint32_t actual_size) {
-  MOJO_DCHECK(max_pending_sends_ == 1);
+  DCHECK_EQ(max_pending_sends_, 1u);
 
   if (actual_size == 0) {
-    assert(false);
+    NOTREACHED();
     return;
   }