Move SpawnedTestServer to its own subdirectory.

This is a part of replacing most usages of the Python test server
with an in-process C++ test server that should be easier to debug.

BUG=96594
R=rch@chromium.org

Review URL: https://codereview.chromium.org/14691006

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

11 files changed, 26 insertions, 26 deletions

diff --git a/net/test/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index ab9b121..d8ecc2f 100644
--- a/net/test/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.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 "net/test/base_test_server.h"
+#include "net/test/spawned_test_server/base_test_server.h"
 
 #include <string>
 #include <vector>
diff --git a/net/test/base_test_server.h b/net/test/spawned_test_server/base_test_server.h
index 898632e..9691f5d 100644
--- a/net/test/base_test_server.h
+++ b/net/test/spawned_test_server/base_test_server.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_TEST_BASE_TEST_SERVER_H_
-#define NET_TEST_BASE_TEST_SERVER_H_
+#ifndef NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
+#define NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
 
 #include <string>
 #include <utility>
@@ -255,5 +255,5 @@ class BaseTestServer {
 
 }  // namespace net
 
-#endif  // NET_TEST_BASE_TEST_SERVER_H_
+#endif  // NET_TEST_SPAWNED_TEST_SERVER_BASE_TEST_SERVER_H_
 
diff --git a/net/test/local_test_server.cc b/net/test/spawned_test_server/local_test_server.cc
index 25a792e..319489e 100644
--- a/net/test/local_test_server.cc
+++ b/net/test/spawned_test_server/local_test_server.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 "net/test/local_test_server.h"
+#include "net/test/spawned_test_server/local_test_server.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
diff --git a/net/test/local_test_server.h b/net/test/spawned_test_server/local_test_server.h
index fcc7ebf..8f79b8f 100644
--- a/net/test/local_test_server.h
+++ b/net/test/spawned_test_server/local_test_server.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_TEST_LOCAL_TEST_SERVER_H_
-#define NET_TEST_LOCAL_TEST_SERVER_H_
+#ifndef NET_TEST_SPAWNED_TEST_SERVER_LOCAL_TEST_SERVER_H_
+#define NET_TEST_SPAWNED_TEST_SERVER_LOCAL_TEST_SERVER_H_
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/process.h"
-#include "net/test/base_test_server.h"
+#include "net/test/spawned_test_server/base_test_server.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_handle.h"
@@ -114,4 +114,4 @@ class LocalTestServer : public BaseTestServer {
 
 }  // namespace net
 
-#endif  // NET_TEST_LOCAL_TEST_SERVER_H_
+#endif  // NET_TEST_SPAWNED_TEST_SERVER_LOCAL_TEST_SERVER_H_
diff --git a/net/test/local_test_server_posix.cc b/net/test/spawned_test_server/local_test_server_posix.cc
index 27fe282..b4e586f 100644
--- a/net/test/local_test_server_posix.cc
+++ b/net/test/spawned_test_server/local_test_server_posix.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 "net/test/local_test_server.h"
+#include "net/test/spawned_test_server/local_test_server.h"
 
 #include <poll.h>
 
diff --git a/net/test/local_test_server_win.cc b/net/test/spawned_test_server/local_test_server_win.cc
index 9562360..b3caad7 100644
--- a/net/test/local_test_server_win.cc
+++ b/net/test/spawned_test_server/local_test_server_win.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 "net/test/local_test_server.h"
+#include "net/test/spawned_test_server/local_test_server.h"
 
 #include <windows.h>
 #include <wincrypt.h>
diff --git a/net/test/remote_test_server.cc b/net/test/spawned_test_server/remote_test_server.cc
index 0692fae..b930169 100644
--- a/net/test/remote_test_server.cc
+++ b/net/test/spawned_test_server/remote_test_server.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 "net/test/remote_test_server.h"
+#include "net/test/spawned_test_server/remote_test_server.h"
 
 #include <vector>
 
@@ -18,7 +18,7 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
-#include "net/test/spawner_communicator.h"
+#include "net/test/spawned_test_server/spawner_communicator.h"
 
 namespace net {
 
diff --git a/net/test/remote_test_server.h b/net/test/spawned_test_server/remote_test_server.h
index 5d8e2b6..de12e4e 100644
--- a/net/test/remote_test_server.h
+++ b/net/test/spawned_test_server/remote_test_server.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_TEST_REMOTE_TEST_SERVER_H_
-#define NET_TEST_REMOTE_TEST_SERVER_H_
+#ifndef NET_TEST_SPAWNED_TEST_SERVER_REMOTE_TEST_SERVER_H_
+#define NET_TEST_SPAWNED_TEST_SERVER_REMOTE_TEST_SERVER_H_
 
 #include <string>
 
-#include "net/test/base_test_server.h"
+#include "net/test/spawned_test_server/base_test_server.h"
 
 namespace net {
 
@@ -67,5 +67,5 @@ class RemoteTestServer : public BaseTestServer {
 
 }  // namespace net
 
-#endif  // NET_TEST_REMOTE_TEST_SERVER_H_
+#endif  // NET_TEST_SPAWNED_TEST_SERVER_REMOTE_TEST_SERVER_H_
 
diff --git a/net/test/spawned_test_server.h b/net/test/spawned_test_server/spawned_test_server.h
index f673869..9bf5831 100644
--- a/net/test/spawned_test_server.h
+++ b/net/test/spawned_test_server/spawned_test_server.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_TEST_SPAWNED_TEST_SERVER_H_
-#define NET_TEST_SPAWNED_TEST_SERVER_H_
+#ifndef NET_TEST_SPAWNED_TEST_SERVER_SPAWNED_TEST_SERVER_H_
+#define NET_TEST_SPAWNED_TEST_SERVER_SPAWNED_TEST_SERVER_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_ANDROID)
-#include "net/test/remote_test_server.h"
+#include "net/test/spawned_test_server/remote_test_server.h"
 #else
-#include "net/test/local_test_server.h"
+#include "net/test/spawned_test_server/local_test_server.h"
 #endif
 
 namespace net {
@@ -23,5 +23,5 @@ typedef LocalTestServer SpawnedTestServer;
 
 }  // namespace net
 
-#endif  // NET_TEST_SPAWNED_TEST_SERVER_H_
+#endif  // NET_TEST_SPAWNED_TEST_SERVER_SPAWNED_TEST_SERVER_H_
 
diff --git a/net/test/spawner_communicator.cc b/net/test/spawned_test_server/spawner_communicator.cc
index 97bc8f8..1602fb3 100644
--- a/net/test/spawner_communicator.cc
+++ b/net/test/spawned_test_server/spawner_communicator.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 "net/test/spawner_communicator.h"
+#include "net/test/spawned_test_server/spawner_communicator.h"
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
diff --git a/net/test/spawner_communicator.h b/net/test/spawned_test_server/spawner_communicator.h
index 6280a48..bf426e6 100644
--- a/net/test/spawner_communicator.h
+++ b/net/test/spawned_test_server/spawner_communicator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_TEST_SPAWNER_COMMUNICATOR_H_
-#define NET_TEST_SPAWNER_COMMUNICATOR_H_
+#ifndef NET_TEST_SPAWNED_TEST_SERVER_SPAWNER_COMMUNICATOR_H_
+#define NET_TEST_SPAWNED_TEST_SERVER_SPAWNER_COMMUNICATOR_H_
 
 #include <string>
 
@@ -148,4 +148,4 @@ class SpawnerCommunicator : public net::URLRequest::Delegate {
 
 }  // namespace net
 
-#endif  // NET_TEST_SPAWNER_COMMUNICATOR_H_
+#endif  // NET_TEST_SPAWNED_TEST_SERVER_SPAWNER_COMMUNICATOR_H_