Moving net/tools/quic code to net::tools namspace

This will prevent naming conflicts with similar classes in net/quic 

BUG=


Review URL: https://chromiumcodereview.appspot.com/13741012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192922 0039d316-1c4b-4281-b951-d872f2087c98

38 files changed, 98 insertions, 14 deletions

diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
index 70b9a76..e98c4ea 100644
--- a/net/tools/quic/end_to_end_test.cc
+++ b/net/tools/quic/end_to_end_test.cc
@@ -27,9 +27,12 @@
 
 using base::StringPiece;
 using base::WaitableEvent;
+using net::test::QuicSessionPeer;
+using net::test::ReliableQuicStreamPeer;
 using std::string;
 
 namespace net {
+namespace tools {
 namespace test {
 namespace {
 
@@ -520,4 +523,5 @@ TEST_F(EndToEndTest, ResetConnection) {
 
 }  // namespace
 }  // namespace test
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_client.cc b/net/tools/quic/quic_client.cc
index b57e761..4a61ab4 100644
--- a/net/tools/quic/quic_client.cc
+++ b/net/tools/quic/quic_client.cc
@@ -25,6 +25,7 @@
 #endif
 
 namespace net {
+namespace tools {
 
 const int kEpollFlags = EPOLLIN | EPOLLOUT | EPOLLET;
 
@@ -243,4 +244,5 @@ bool QuicClient::ReadAndProcessPacket() {
   return true;
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_client.h b/net/tools/quic/quic_client.h
index 8a63106..1328a5e 100644
--- a/net/tools/quic/quic_client.h
+++ b/net/tools/quic/quic_client.h
@@ -20,6 +20,7 @@
 #include "net/tools/quic/quic_reliable_client_stream.h"
 
 namespace net {
+namespace tools {
 
 class QuicClient : public EpollCallbackInterface {
  public:
@@ -143,6 +144,7 @@ class QuicClient : public EpollCallbackInterface {
   DISALLOW_COPY_AND_ASSIGN(QuicClient);
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_CLIENT_H_
diff --git a/net/tools/quic/quic_client_bin.cc b/net/tools/quic/quic_client_bin.cc
index d016af3..d9b2b90 100644
--- a/net/tools/quic/quic_client_bin.cc
+++ b/net/tools/quic/quic_client_bin.cc
@@ -26,7 +26,7 @@ int main(int argc, char *argv[]) {
 
   net::IPAddressNumber addr;
   CHECK(net::ParseIPLiteralToNumber(FLAGS_address, &addr));
-  net::QuicClient client(
+  net::tools::QuicClient client(
       net::IPEndPoint(addr, FLAGS_port), FLAGS_hostname);
 
   client.Initialize();
diff --git a/net/tools/quic/quic_client_session.cc b/net/tools/quic/quic_client_session.cc
index f288ae9..a3e18dc 100644
--- a/net/tools/quic/quic_client_session.cc
+++ b/net/tools/quic/quic_client_session.cc
@@ -12,9 +12,7 @@
 using std::string;
 
 namespace net {
-
-class QuicConnection;
-class ReliableQuicStream;
+namespace tools {
 
 QuicClientSession::QuicClientSession(
     const string& server_hostname,
@@ -61,4 +59,5 @@ ReliableQuicStream* QuicClientSession::CreateIncomingReliableStream(
   return NULL;
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_client_session.h b/net/tools/quic/quic_client_session.h
index 9eb24f6..18bd63b 100644
--- a/net/tools/quic/quic_client_session.h
+++ b/net/tools/quic/quic_client_session.h
@@ -17,9 +17,12 @@
 namespace net {
 
 class QuicConnection;
-class QuicReliableClientStream;
 class ReliableQuicStream;
 
+namespace tools {
+
+class QuicReliableClientStream;
+
 class QuicClientSession : public QuicSession {
  public:
   QuicClientSession(const std::string& server_hostname,
@@ -45,6 +48,7 @@ class QuicClientSession : public QuicSession {
   DISALLOW_COPY_AND_ASSIGN(QuicClientSession);
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_CLIENT_SESSION_H_
diff --git a/net/tools/quic/quic_dispatcher.cc b/net/tools/quic/quic_dispatcher.cc
index 7574ba0c..9b5ab84 100644
--- a/net/tools/quic/quic_dispatcher.cc
+++ b/net/tools/quic/quic_dispatcher.cc
@@ -14,6 +14,7 @@
 #include "net/tools/quic/quic_socket_utils.h"
 
 namespace net {
+namespace tools {
 
 using std::make_pair;
 
@@ -179,6 +180,7 @@ QuicSession* QuicDispatcher::CreateQuicSession(
       new QuicConnection(guid, client_address, helper, true), this);
 }
 
+}  // namespace tools
 }  // namespace net
 
 
diff --git a/net/tools/quic/quic_dispatcher.h b/net/tools/quic/quic_dispatcher.h
index 554a0d3..e3957da 100644
--- a/net/tools/quic/quic_dispatcher.h
+++ b/net/tools/quic/quic_dispatcher.h
@@ -24,7 +24,8 @@
 namespace BASE_HASH_NAMESPACE {
 template<>
 struct hash<net::QuicBlockedWriterInterface*> {
-  std::size_t operator()(const net::QuicBlockedWriterInterface* ptr) const {
+  std::size_t operator()(
+      const net::QuicBlockedWriterInterface* ptr) const {
     return hash<size_t>()(reinterpret_cast<size_t>(ptr));
   }
 };
@@ -38,6 +39,7 @@ namespace gfe2 {
 class QuicSession;
 
 namespace net {
+namespace tools {
 
 class DeleteSessionsAlarm;
 
@@ -123,6 +125,7 @@ class QuicDispatcher : public QuicPacketWriter, public QuicSessionOwner {
   DISALLOW_COPY_AND_ASSIGN(QuicDispatcher);
 };
 
-} // namespace net
+}  // namespace tools
+}  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_DISPATCHER_H_
diff --git a/net/tools/quic/quic_epoll_clock.cc b/net/tools/quic/quic_epoll_clock.cc
index 70746b8..eb7eb65 100644
--- a/net/tools/quic/quic_epoll_clock.cc
+++ b/net/tools/quic/quic_epoll_clock.cc
@@ -7,6 +7,7 @@
 #include "net/tools/flip_server/epoll_server.h"
 
 namespace net {
+namespace tools {
 
 QuicEpollClock::QuicEpollClock(EpollServer* epoll_server)
     : epoll_server_(epoll_server) {
@@ -28,4 +29,5 @@ QuicTime::Delta QuicEpollClock::NowAsDeltaSinceUnixEpoch() const {
   return QuicTime::Delta::FromMicroseconds(epoll_server_->NowInUsec());
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_epoll_clock.h b/net/tools/quic/quic_epoll_clock.h
index a867e87..476910a 100644
--- a/net/tools/quic/quic_epoll_clock.h
+++ b/net/tools/quic/quic_epoll_clock.h
@@ -13,6 +13,8 @@ namespace net {
 
 class EpollServer;
 
+namespace tools {
+
 // Clock to efficiently retrieve an approximately accurate time from an
 // EpollServer.
 class QuicEpollClock : public QuicClock {
@@ -36,6 +38,7 @@ class QuicEpollClock : public QuicClock {
   EpollServer* epoll_server_;
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // GFE_QUIC_QUIC_EPOLL_CLOCK_H_
diff --git a/net/tools/quic/quic_epoll_connection_helper.cc b/net/tools/quic/quic_epoll_connection_helper.cc
index 75f0653..d4266a2 100644
--- a/net/tools/quic/quic_epoll_connection_helper.cc
+++ b/net/tools/quic/quic_epoll_connection_helper.cc
@@ -15,6 +15,7 @@
 #include "net/tools/quic/quic_socket_utils.h"
 
 namespace net {
+namespace tools {
 
 // This alarm will be scheduled any time a data-bearing packet is sent out.
 // When the alarm goes off, the connection checks to see if the oldest packets
@@ -203,4 +204,5 @@ void QuicEpollConnectionHelper::UnregisterSendAlarmIfRegistered() {
   send_alarm_->UnregisterIfRegistered();
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_epoll_connection_helper.h b/net/tools/quic/quic_epoll_connection_helper.h
index 59c539c..edf5615 100644
--- a/net/tools/quic/quic_epoll_connection_helper.h
+++ b/net/tools/quic/quic_epoll_connection_helper.h
@@ -20,9 +20,12 @@
 
 namespace net {
 
-class AckAlarm;
 class EpollServer;
 class QuicRandom;
+
+namespace tools {
+
+class AckAlarm;
 class RetransmissionAlarm;
 class SendAlarm;
 class TimeoutAlarm;
@@ -77,6 +80,7 @@ class QuicEpollConnectionHelper : public QuicConnectionHelperInterface {
   DISALLOW_COPY_AND_ASSIGN(QuicEpollConnectionHelper);
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_EPOLL_CONNECTION_HELPER_H_
diff --git a/net/tools/quic/quic_in_memory_cache.cc b/net/tools/quic/quic_in_memory_cache.cc
index ede999f..22bff44 100644
--- a/net/tools/quic/quic_in_memory_cache.cc
+++ b/net/tools/quic/quic_in_memory_cache.cc
@@ -18,6 +18,7 @@ using std::string;
 string FLAGS_quic_in_memory_cache_dir;
 
 namespace net {
+namespace tools {
 
 namespace {
 
@@ -186,4 +187,5 @@ string QuicInMemoryCache::GetKey(const BalsaHeaders& request_headers) const {
       request_headers.request_uri().as_string();
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_in_memory_cache.h b/net/tools/quic/quic_in_memory_cache.h
index cfbd25e..c49a27a 100644
--- a/net/tools/quic/quic_in_memory_cache.h
+++ b/net/tools/quic/quic_in_memory_cache.h
@@ -16,6 +16,7 @@
 template <typename T> struct DefaultSingletonTraits;
 
 namespace net {
+namespace tools {
 
 class QuicServer;
 
@@ -76,6 +77,7 @@ class QuicInMemoryCache {
   DISALLOW_COPY_AND_ASSIGN(QuicInMemoryCache);
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_IN_MEMORY_CACHE_H_
diff --git a/net/tools/quic/quic_packet_writer.h b/net/tools/quic/quic_packet_writer.h
index d95a7f9..b10e852 100644
--- a/net/tools/quic/quic_packet_writer.h
+++ b/net/tools/quic/quic_packet_writer.h
@@ -11,6 +11,8 @@ namespace net {
 
 class QuicBlockedWriterInterface;
 
+namespace tools {
+
 // An interface between writers and the entity managing the
 // socket (in our case the QuicDispatcher).  This allows the Dispatcher to
 // control writes, and manage any writers who end up write blocked.
@@ -25,6 +27,7 @@ class QuicPacketWriter {
                           int* error) = 0;
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_PACKET_WRITER_H_
diff --git a/net/tools/quic/quic_reliable_client_stream.cc b/net/tools/quic/quic_reliable_client_stream.cc
index c7941f2..359fec4 100644
--- a/net/tools/quic/quic_reliable_client_stream.cc
+++ b/net/tools/quic/quic_reliable_client_stream.cc
@@ -7,6 +7,7 @@
 using std::string;
 
 namespace net {
+namespace tools {
 
 // Sends body data to the server and returns the number of bytes sent.
 ssize_t QuicReliableClientStream::SendBody(const string& data, bool fin) {
@@ -22,4 +23,5 @@ bool QuicReliableClientStream::OnStreamFrame(const QuicStreamFrame& frame) {
   return ReliableQuicStream::OnStreamFrame(frame);
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_reliable_client_stream.h b/net/tools/quic/quic_reliable_client_stream.h
index e5663a5..17cc7d4 100644
--- a/net/tools/quic/quic_reliable_client_stream.h
+++ b/net/tools/quic/quic_reliable_client_stream.h
@@ -16,9 +16,12 @@
 
 namespace net {
 
-class QuicClientSession;
 class QuicSession;
 
+namespace tools {
+
+class QuicClientSession;
+
 // A base class for spdy/http client streams which handles the concept
 // of sending and receiving headers and bodies.
 class QuicReliableClientStream : public ReliableQuicStream {
@@ -60,6 +63,7 @@ class QuicReliableClientStream : public ReliableQuicStream {
   DISALLOW_COPY_AND_ASSIGN(QuicReliableClientStream);
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_RELIABLE_CLIENT_STREAM_H_
diff --git a/net/tools/quic/quic_reliable_server_stream.cc b/net/tools/quic/quic_reliable_server_stream.cc
index a449079..58b884a 100644
--- a/net/tools/quic/quic_reliable_server_stream.cc
+++ b/net/tools/quic/quic_reliable_server_stream.cc
@@ -11,6 +11,7 @@
 using base::StringPiece;
 
 namespace net {
+namespace tools {
 
 QuicReliableServerStream::QuicReliableServerStream(QuicStreamId id,
                                                   QuicSession* session)
@@ -51,4 +52,5 @@ QuicConsumedData QuicReliableServerStream::WriteData(StringPiece data,
   return ReliableQuicStream::WriteData(data, fin);
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_reliable_server_stream.h b/net/tools/quic/quic_reliable_server_stream.h
index e9f139a..2669f42 100644
--- a/net/tools/quic/quic_reliable_server_stream.h
+++ b/net/tools/quic/quic_reliable_server_stream.h
@@ -13,12 +13,14 @@
 
 namespace net {
 
+class QuicSession;
+
+namespace tools {
+
 namespace test {
 class QuicReliableServerStreamPeer;
 }  // namespace test
 
-class QuicSession;
-
 // A base class for spdy/http server streams which handles the concept
 // of sending and receiving headers and bodies.
 class QuicReliableServerStream : public ReliableQuicStream {
@@ -57,6 +59,7 @@ class QuicReliableServerStream : public ReliableQuicStream {
   string body_;
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_RELIABLE_SERVER_STREAM_H_
diff --git a/net/tools/quic/quic_server.cc b/net/tools/quic/quic_server.cc
index 6adee2d..6f761ae 100644
--- a/net/tools/quic/quic_server.cc
+++ b/net/tools/quic/quic_server.cc
@@ -27,6 +27,7 @@ const int kEpollFlags = EPOLLIN | EPOLLOUT | EPOLLET;
 const int kNumPacketsPerReadCall = 5;  // Arbitrary
 
 namespace net {
+namespace tools {
 
 QuicServer::QuicServer()
     : port_(0),
@@ -180,4 +181,5 @@ bool QuicServer::ReadAndDispatchSinglePacket(int fd,
   return true;
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_server.h b/net/tools/quic/quic_server.h
index cc779ea..813510c 100644
--- a/net/tools/quic/quic_server.h
+++ b/net/tools/quic/quic_server.h
@@ -15,6 +15,7 @@
 #include "net/tools/quic/quic_dispatcher.h"
 
 namespace net {
+namespace tools {
 
 class QuicDispatcher;
 
@@ -84,6 +85,7 @@ class QuicServer : public EpollCallbackInterface {
   DISALLOW_COPY_AND_ASSIGN(QuicServer);
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_SERVER_H_
diff --git a/net/tools/quic/quic_server_bin.cc b/net/tools/quic/quic_server_bin.cc
index b5f4ec2..6be545a 100644
--- a/net/tools/quic/quic_server_bin.cc
+++ b/net/tools/quic/quic_server_bin.cc
@@ -22,7 +22,7 @@ int main(int argc, char *argv[]) {
   net::IPAddressNumber ip;
   CHECK(net::ParseIPLiteralToNumber("::", &ip));
 
-  net::QuicServer server;
+  net::tools::QuicServer server;
 
   if (!server.Listen(net::IPEndPoint(ip, FLAGS_port))) {
     return 1;
diff --git a/net/tools/quic/quic_server_session.cc b/net/tools/quic/quic_server_session.cc
index 94c492d..fc84f75 100644
--- a/net/tools/quic/quic_server_session.cc
+++ b/net/tools/quic/quic_server_session.cc
@@ -9,6 +9,7 @@
 #include "net/tools/quic/quic_spdy_server_stream.h"
 
 namespace net {
+namespace tools {
 
 QuicServerSession::QuicServerSession(QuicConnection* connection,
                                      QuicSessionOwner* owner)
@@ -58,4 +59,5 @@ QuicCryptoServerStream* QuicServerSession::GetCryptoStream() {
   return &crypto_stream_;
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_server_session.h b/net/tools/quic/quic_server_session.h
index 36af7f5..91a0704 100644
--- a/net/tools/quic/quic_server_session.h
+++ b/net/tools/quic/quic_server_session.h
@@ -20,6 +20,8 @@ namespace net {
 class QuicConnection;
 class ReliableQuicStream;
 
+namespace tools {
+
 // An interface from the session to the entity owning the session.
 // This lets the session notify its owner (the Dispatcher) when the connection
 // is closed.
@@ -58,6 +60,7 @@ class QuicServerSession : public QuicSession {
   DISALLOW_COPY_AND_ASSIGN(QuicServerSession);
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_SERVER_SESSION_H_
diff --git a/net/tools/quic/quic_socket_utils.cc b/net/tools/quic/quic_socket_utils.cc
index 7e20dd7..1798b04 100644
--- a/net/tools/quic/quic_socket_utils.cc
+++ b/net/tools/quic/quic_socket_utils.cc
@@ -18,6 +18,7 @@
 #endif
 
 namespace net {
+namespace tools {
 
 // static
 IPAddressNumber QuicSocketUtils::GetAddressFromMsghdr(struct msghdr *hdr) {
@@ -178,4 +179,5 @@ int QuicSocketUtils::WritePacket(int fd, const char* buffer, size_t buf_len,
   return rc;
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_socket_utils.h b/net/tools/quic/quic_socket_utils.h
index de8117b..bfacc6c 100644
--- a/net/tools/quic/quic_socket_utils.h
+++ b/net/tools/quic/quic_socket_utils.h
@@ -14,6 +14,7 @@
 #include "net/base/ip_endpoint.h"
 
 namespace net {
+namespace tools {
 
 class QuicSocketUtils {
  public:
@@ -52,6 +53,7 @@ class QuicSocketUtils {
                          int* error);
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_SOCKET_UTILS_H_
diff --git a/net/tools/quic/quic_spdy_client_stream.cc b/net/tools/quic/quic_spdy_client_stream.cc
index 3840ebb..d9df638 100644
--- a/net/tools/quic/quic_spdy_client_stream.cc
+++ b/net/tools/quic/quic_spdy_client_stream.cc
@@ -12,6 +12,7 @@ using base::StringPiece;
 using std::string;
 
 namespace net {
+namespace tools {
 
 static const size_t kHeaderBufInitialSize = 4096;
 
@@ -84,4 +85,5 @@ int QuicSpdyClientStream::ParseResponseHeaders() {
   return len;
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_spdy_client_stream.h b/net/tools/quic/quic_spdy_client_stream.h
index ea142ba..1df6c73 100644
--- a/net/tools/quic/quic_spdy_client_stream.h
+++ b/net/tools/quic/quic_spdy_client_stream.h
@@ -13,6 +13,8 @@ namespace net {
 
 class BalsaHeaders;
 
+namespace tools {
+
 class QuicClientSession;
 
 // All this does right now is send an SPDY request, and aggregate the
@@ -37,6 +39,7 @@ class QuicSpdyClientStream : public QuicReliableClientStream {
   bool response_headers_received_;
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_SPDY_CLIENT_STREAM_H_
diff --git a/net/tools/quic/quic_spdy_server_stream.cc b/net/tools/quic/quic_spdy_server_stream.cc
index 6d98e19..57c520e 100644
--- a/net/tools/quic/quic_spdy_server_stream.cc
+++ b/net/tools/quic/quic_spdy_server_stream.cc
@@ -10,6 +10,7 @@
 using std::string;
 
 namespace net {
+namespace tools {
 
 static const size_t kHeaderBufInitialSize = 4096;
 
@@ -91,4 +92,5 @@ int QuicSpdyServerStream::ParseRequestHeaders() {
   return len;
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_spdy_server_stream.h b/net/tools/quic/quic_spdy_server_stream.h
index ed6e717..8ed2a8f 100644
--- a/net/tools/quic/quic_spdy_server_stream.h
+++ b/net/tools/quic/quic_spdy_server_stream.h
@@ -12,10 +12,12 @@
 
 namespace net {
 
-// All this does right now is aggregate data, and on fin, send a cached
-// response.
 class QuicSession;
 
+namespace tools {
+
+// All this does right now is aggregate data, and on fin, send a cached
+// response.
 class QuicSpdyServerStream : public QuicReliableServerStream {
  public:
   QuicSpdyServerStream(QuicStreamId id, QuicSession* session);
@@ -37,6 +39,7 @@ class QuicSpdyServerStream : public QuicReliableServerStream {
   bool request_headers_received_;
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_SPDY_SERVER_STREAM_H_
diff --git a/net/tools/quic/quic_time_wait_list_manager.cc b/net/tools/quic/quic_time_wait_list_manager.cc
index 02dbb63..db44494 100644
--- a/net/tools/quic/quic_time_wait_list_manager.cc
+++ b/net/tools/quic/quic_time_wait_list_manager.cc
@@ -19,6 +19,7 @@
 #include "net/quic/quic_utils.h"
 
 namespace net {
+namespace tools {
 
 namespace {
 
@@ -278,4 +279,5 @@ void QuicTimeWaitListManager::CleanUpOldGuids() {
   SetGuidCleanUpAlarm();
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/quic_time_wait_list_manager.h b/net/tools/quic/quic_time_wait_list_manager.h
index d7e7c68..9919134 100644
--- a/net/tools/quic/quic_time_wait_list_manager.h
+++ b/net/tools/quic/quic_time_wait_list_manager.h
@@ -20,6 +20,7 @@
 #include "net/tools/quic/quic_packet_writer.h"
 
 namespace net {
+namespace tools {
 
 class GuidCleanUpAlarm;
 
@@ -175,6 +176,7 @@ class QuicTimeWaitListManager : public QuicBlockedWriterInterface,
   DISALLOW_COPY_AND_ASSIGN(QuicTimeWaitListManager);
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_TIME_WAIT_LIST_MANAGER_H_
diff --git a/net/tools/quic/spdy_utils.cc b/net/tools/quic/spdy_utils.cc
index 9078866..f15b5d4 100644
--- a/net/tools/quic/spdy_utils.cc
+++ b/net/tools/quic/spdy_utils.cc
@@ -21,6 +21,7 @@ using std::pair;
 using std::string;
 
 namespace net {
+namespace tools {
 
 const char* const kV3Host = ":host";
 const char* const kV3Path = ":path";
@@ -246,4 +247,5 @@ bool SpdyUtils::FillBalsaResponseHeaders(
   return true;
 }
 
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/spdy_utils.h b/net/tools/quic/spdy_utils.h
index 8b6e1b8..0c9653f 100644
--- a/net/tools/quic/spdy_utils.h
+++ b/net/tools/quic/spdy_utils.h
@@ -12,6 +12,7 @@
 #include "net/tools/flip_server/balsa_headers.h"
 
 namespace net {
+namespace tools {
 
 class SpdyUtils {
  public:
@@ -28,6 +29,7 @@ class SpdyUtils {
                                        BalsaHeaders* response_headers);
 };
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_SPDY_UTILS_H_
diff --git a/net/tools/quic/test_tools/http_message_test_utils.cc b/net/tools/quic/test_tools/http_message_test_utils.cc
index 62d969f..7d6df7a 100644
--- a/net/tools/quic/test_tools/http_message_test_utils.cc
+++ b/net/tools/quic/test_tools/http_message_test_utils.cc
@@ -15,6 +15,7 @@ using std::string;
 using std::vector;
 
 namespace net {
+namespace tools {
 namespace test {
 
 namespace {
@@ -170,4 +171,5 @@ void HTTPMessage::ValidateMessage() const {
 }
 
 }  // namespace test
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/test_tools/http_message_test_utils.h b/net/tools/quic/test_tools/http_message_test_utils.h
index d594295..c01df42 100644
--- a/net/tools/quic/test_tools/http_message_test_utils.h
+++ b/net/tools/quic/test_tools/http_message_test_utils.h
@@ -13,6 +13,7 @@
 #include "net/tools/flip_server/balsa_headers.h"
 
 namespace net {
+namespace tools {
 namespace test {
 
 class HttpConstants {
@@ -126,6 +127,7 @@ class HTTPMessage {
 };
 
 }  // namespace test
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_TEST_TOOLS_TEST_TOOLS_HTTP_MESSAGE_TEST_UTILS_H_
diff --git a/net/tools/quic/test_tools/quic_test_client.cc b/net/tools/quic/test_tools/quic_test_client.cc
index 43ac914..53bc057 100644
--- a/net/tools/quic/test_tools/quic_test_client.cc
+++ b/net/tools/quic/test_tools/quic_test_client.cc
@@ -11,6 +11,7 @@ using std::string;
 using base::StringPiece;
 
 namespace net {
+namespace tools {
 namespace test {
 
 BalsaHeaders* MungeHeaders(const BalsaHeaders* const_headers) {
@@ -178,4 +179,5 @@ void QuicTestClient::OnClose(ReliableQuicStream* stream) {
 }
 
 }  // namespace test
+}  // namespace tools
 }  // namespace net
diff --git a/net/tools/quic/test_tools/quic_test_client.h b/net/tools/quic/test_tools/quic_test_client.h
index 1bb4f07..343c99c 100644
--- a/net/tools/quic/test_tools/quic_test_client.h
+++ b/net/tools/quic/test_tools/quic_test_client.h
@@ -14,6 +14,7 @@
 #include "net/tools/quic/quic_client.h"
 
 namespace net {
+namespace tools {
 
 namespace test {
 
@@ -90,6 +91,7 @@ class QuicTestClient :  public ReliableQuicStream::Visitor {
 
 }  // namespace test
 
+}  // namespace tools
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_QUIC_CLIENT_H_