Move socket related files from net/base to net/socket.

net/socket/socket_test_util.h

 // Copyright (c) 2009 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 NET_BASE_SOCKET_TEST_UTIL_H_
-#define NET_BASE_SOCKET_TEST_UTIL_H_
+#ifndef NET_SOCKET_SOCKET_TEST_UTIL_H_
+#define NET_SOCKET_SOCKET_TEST_UTIL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "net/base/address_list.h"
-#include "net/base/client_socket_factory.h"
 #include "net/base/net_errors.h"
 #include "net/base/ssl_config_service.h"
+#include "net/socket/client_socket_factory.h"
 
 namespace net {
 
 class ClientSocket;
 class SSLClientSocket;
 
 struct MockConnect {
   // Asynchronous connection success.
   MockConnect() : async(true), result(OK) { }
   MockConnect(bool a, int r) : async(a), result(r) { }
@@ skipping 167 matching lines @@
       const std::string& hostname,
       const SSLConfig& ssl_config);
 
  private:
   MockSocketArray<MockSocket> mock_sockets_;
   MockSocketArray<MockSSLSocket> mock_ssl_sockets_;
 };
 
 }  // namespace net
 
-#endif  // NET_BASE_SOCKET_TEST_UTIL_H_
+#endif  // NET_SOCKET_SOCKET_TEST_UTIL_H_