net: move test files out of net/base

BUG=70818

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

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

8 files changed, 14 insertions, 11 deletions

diff --git a/build/android/findbugs_filter/findbugs_known_bugs.txt b/build/android/findbugs_filter/findbugs_known_bugs.txt
index ae7d336..1a4ef4e 100644
--- a/build/android/findbugs_filter/findbugs_known_bugs.txt
+++ b/build/android/findbugs_filter/findbugs_known_bugs.txt
@@ -58,3 +58,6 @@ M V MS: org.chromium.content.browser.LoadUrlParams.LOAD_TYPE_DEFAULT should be p
 M V MS: org.chromium.content.browser.LoadUrlParams.UA_OVERRIDE_INHERIT should be package protected  In LoadUrlParams.java
 M V MS: org.chromium.content.browser.LoadUrlParams.UA_OVERRIDE_TRUE should be package protected  In LoadUrlParams.java
 M M LI: Incorrect lazy initialization of static field org.chromium.chrome.browser.sync.ProfileSyncService.sSyncSetupManager in org.chromium.chrome.browser.sync.ProfileSyncService.get(Context)  At ProfileSyncService.java
+H D ST: Write to static field org.chromium.net.test.util.TestWebServer.sInstance from instance method org.chromium.net.test.util.TestWebServer.shutdown()  At TestWebServer.java
+M D DLS: Dead store to time in org.chromium.net.test.util.TestWebServer.setDateHeaders(HttpResponse)  At TestWebServer.java
+M D ST: Write to static field org.chromium.net.test.util.TestWebServer.sInstance from instance method new org.chromium.net.test.util.TestWebServer(boolean)  At TestWebServer.java
diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h
index 1c1e9f4..b02d6f4 100644
--- a/chrome_frame/test/net/fake_external_tab.h
+++ b/chrome_frame/test/net/fake_external_tab.h
@@ -18,7 +18,7 @@
 #include "chrome_frame/test_utils.h"
 #include "content/public/browser/browser_main_parts.h"
 #include "content/public/browser/browser_thread.h"
-#include "net/base/net_test_suite.h"
+#include "net/test/net_test_suite.h"
 
 class CommandLine;
 class FakeBrowserProcessImpl;
diff --git a/net/net.gyp b/net/net.gyp
index 3bf68cc..f66d8f6 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1409,7 +1409,6 @@
         'base/prioritized_dispatcher_unittest.cc',
         'base/priority_queue_unittest.cc',
         'base/registry_controlled_domains/registry_controlled_domain_unittest.cc',
-        'base/run_all_unittests.cc',
         'base/sdch_filter_unittest.cc',
         'base/single_request_host_resolver_unittest.cc',
         'base/static_cookie_policy_unittest.cc',
@@ -1661,6 +1660,7 @@
         'ssl/ssl_client_auth_cache_unittest.cc',
         'ssl/ssl_config_service_unittest.cc',
         'test/python_utils_unittest.cc',
+        'test/run_all_unittests.cc',
         'tools/dump_cache/url_to_filename_encoder.cc',
         'tools/dump_cache/url_to_filename_encoder.h',
         'tools/dump_cache/url_to_filename_encoder_unittest.cc',
@@ -1984,8 +1984,6 @@
         'base/mock_file_stream.h',
         'base/mock_host_resolver.cc',
         'base/mock_host_resolver.h',
-        'base/net_test_suite.cc',
-        'base/net_test_suite.h',
         'base/test_completion_callback.cc',
         'base/test_completion_callback.h',
         'base/test_data_directory.cc',
@@ -2018,6 +2016,8 @@
         'test/local_test_server_win.cc',
         'test/local_test_server.cc',
         'test/local_test_server.h',
+        'test/net_test_suite.cc',
+        'test/net_test_suite.h',
         'test/python_utils.cc',
         'test/python_utils.h',
         'test/remote_test_server.cc',
diff --git a/net/proxy/proxy_config_service_android_unittest.cc b/net/proxy/proxy_config_service_android_unittest.cc
index b7bdb3e..faa9fd1 100644
--- a/net/proxy/proxy_config_service_android_unittest.cc
+++ b/net/proxy/proxy_config_service_android_unittest.cc
@@ -50,7 +50,7 @@ typedef std::map<std::string, std::string> StringMap;
 class ProxyConfigServiceAndroidTestBase : public testing::Test {
  protected:
   // Note that the current thread's message loop is initialized by the test
-  // suite (see net/base/net_test_suite.cc).
+  // suite (see net/test/net_test_suite.cc).
   ProxyConfigServiceAndroidTestBase(const StringMap& initial_configuration)
       : configuration_(initial_configuration),
         message_loop_(MessageLoop::current()),
diff --git a/net/base/net_test_suite.cc b/net/test/net_test_suite.cc
index 9413058..1687e84 100644
--- a/net/base/net_test_suite.cc
+++ b/net/test/net_test_suite.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/base/net_test_suite.h"
+#include "net/test/net_test_suite.h"
 
 #include "base/message_loop.h"
 #include "net/base/network_change_notifier.h"
diff --git a/net/base/net_test_suite.h b/net/test/net_test_suite.h
index 5a7f025..b2fed70 100644
--- a/net/base/net_test_suite.h
+++ b/net/test/net_test_suite.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_BASE_NET_TEST_SUITE_H_
-#define NET_BASE_NET_TEST_SUITE_H_
+#ifndef NET_TEST_NET_TEST_SUITE_H_
+#define NET_TEST_NET_TEST_SUITE_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/test/test_suite.h"
@@ -50,4 +50,4 @@ class NetTestSuite : public base::TestSuite {
   net::ScopedDefaultHostResolverProc scoped_host_resolver_proc_;
 };
 
-#endif  // NET_BASE_NET_TEST_SUITE_H_
+#endif  // NET_TEST_NET_TEST_SUITE_H_
diff --git a/net/base/run_all_unittests.cc b/net/test/run_all_unittests.cc
index 4a5f997..d8392ff 100644
--- a/net/base/run_all_unittests.cc
+++ b/net/test/run_all_unittests.cc
@@ -5,10 +5,10 @@
 #include "base/metrics/statistics_recorder.h"
 #include "build/build_config.h"
 #include "crypto/nss_util.h"
-#include "net/base/net_test_suite.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "net/socket/ssl_server_socket.h"
 #include "net/spdy/spdy_session.h"
+#include "net/test/net_test_suite.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
diff --git a/net/udp/udp_socket_unittest.cc b/net/udp/udp_socket_unittest.cc
index 6377de9..c2085ad 100644
--- a/net/udp/udp_socket_unittest.cc
+++ b/net/udp/udp_socket_unittest.cc
@@ -13,9 +13,9 @@
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log_unittest.h"
-#include "net/base/net_test_suite.h"
 #include "net/base/net_util.h"
 #include "net/base/test_completion_callback.h"
+#include "net/test/net_test_suite.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"