diff options
92 files changed, 121 insertions, 121 deletions
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index 20594a2..3641cc1 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -25,7 +25,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/chrome/browser/chrome_switches_browsertest.cc b/chrome/browser/chrome_switches_browsertest.cc index ad89341..816200b 100644 --- a/chrome/browser/chrome_switches_browsertest.cc +++ b/chrome/browser/chrome_switches_browsertest.cc @@ -10,7 +10,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" class HostRulesTest : public InProcessBrowserTest { protected: diff --git a/chrome/browser/collected_cookies_browsertest.cc b/chrome/browser/collected_cookies_browsertest.cc index 2f9fce7..539fcac 100644 --- a/chrome/browser/collected_cookies_browsertest.cc +++ b/chrome/browser/collected_cookies_browsertest.cc @@ -13,7 +13,7 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace { diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc index 120118d3..6d31f39 100644 --- a/chrome/browser/content_settings/content_settings_browsertest.cc +++ b/chrome/browser/content_settings/content_settings_browsertest.cc @@ -29,7 +29,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" #include "content/test/net/url_request_mock_http_job.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc index 408dc80..1a7381e 100644 --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc @@ -45,7 +45,7 @@ #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "net/socket/tcp_listen_socket.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" using content::BrowserThread; using content::DevToolsManager; diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 6f687a9..f1b07fa 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -78,7 +78,7 @@ #include "content/test/net/url_request_slow_download_job.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" #include "webkit/plugins/npapi/mock_plugin_list.h" diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc index 75be463..c76a86b 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.h" #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h" #include "content/public/browser/resource_request_info.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc index 78af25e..f81f958 100644 --- a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc @@ -19,7 +19,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "net/dns/mock_host_resolver.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gmock/include/gmock/gmock.h" namespace extensions { diff --git a/chrome/browser/extensions/api/i18n/i18n_apitest.cc b/chrome/browser/extensions/api/i18n/i18n_apitest.cc index 0fb7111..b3972ad5 100644 --- a/chrome/browser/extensions/api/i18n/i18n_apitest.cc +++ b/chrome/browser/extensions/api/i18n/i18n_apitest.cc @@ -10,7 +10,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18N) { ASSERT_TRUE(StartTestServer()); diff --git a/chrome/browser/extensions/api/socket/socket_apitest.cc b/chrome/browser/extensions/api/socket/socket_apitest.cc index bb4e3d0..f2717dd 100644 --- a/chrome/browser/extensions/api/socket/socket_apitest.cc +++ b/chrome/browser/extensions/api/socket/socket_apitest.cc @@ -16,7 +16,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "net/dns/mock_host_resolver.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" using extensions::Extension; diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index bb2279c..83afdb6 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc @@ -19,7 +19,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "net/base/net_util.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace { diff --git a/chrome/browser/extensions/stubs_apitest.cc b/chrome/browser/extensions/stubs_apitest.cc index 5a41bdb..7a5a407 100644 --- a/chrome/browser/extensions/stubs_apitest.cc +++ b/chrome/browser/extensions/stubs_apitest.cc @@ -6,7 +6,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/test/base/ui_test_utils.h" #include "googleurl/src/gurl.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" // Tests that we throw errors when you try using extension APIs that aren't // supported in content scripts. diff --git a/chrome/browser/external_extension_browsertest.cc b/chrome/browser/external_extension_browsertest.cc index 27a735a..ddb4458 100644 --- a/chrome/browser/external_extension_browsertest.cc +++ b/chrome/browser/external_extension_browsertest.cc @@ -13,7 +13,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace { diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 147a454..cdf566a 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -31,7 +31,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "net/base/net_util.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" using content::DomOperationNotificationDetails; using content::NavigationController; diff --git a/chrome/browser/history/multipart_browsertest.cc b/chrome/browser/history/multipart_browsertest.cc index 3fe4a49..aa23661 100644 --- a/chrome/browser/history/multipart_browsertest.cc +++ b/chrome/browser/history/multipart_browsertest.cc @@ -11,7 +11,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/frame_navigate_params.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" class MultipartResponseTest : public InProcessBrowserTest, public content::WebContentsObserver { diff --git a/chrome/browser/history/redirect_browsertest.cc b/chrome/browser/history/redirect_browsertest.cc index 2387fdc..000444f 100644 --- a/chrome/browser/history/redirect_browsertest.cc +++ b/chrome/browser/history/redirect_browsertest.cc @@ -29,7 +29,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "net/base/net_util.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "ui/base/events/event_constants.h" class RedirectTest : public InProcessBrowserTest { diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc index 6e4eb69..a9baaba 100644 --- a/chrome/browser/infobars/infobars_browsertest.cc +++ b/chrome/browser/infobars/infobars_browsertest.cc @@ -17,7 +17,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/ui/ui_test.h" #include "content/public/browser/notification_service.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" class InfoBarsTest : public InProcessBrowserTest { public: diff --git a/chrome/browser/loadtimes_extension_bindings_browsertest.cc b/chrome/browser/loadtimes_extension_bindings_browsertest.cc index d911351..efca60a 100644 --- a/chrome/browser/loadtimes_extension_bindings_browsertest.cc +++ b/chrome/browser/loadtimes_extension_bindings_browsertest.cc @@ -8,7 +8,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" class LoadtimesExtensionBindingsTest : public InProcessBrowserTest { public: diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc index 010b628..916a4bb 100644 --- a/chrome/browser/media/chrome_webrtc_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_browsertest.cc @@ -21,7 +21,7 @@ #include "chrome/test/ui/ui_test.h" #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" static const base::FilePath::CharType kPeerConnectionServer[] = #if defined(OS_WIN) diff --git a/chrome/browser/net/connection_tester_unittest.cc b/chrome/browser/net/connection_tester_unittest.cc index a56759d..aafd6fe8 100644 --- a/chrome/browser/net/connection_tester_unittest.cc +++ b/chrome/browser/net/connection_tester_unittest.cc @@ -17,7 +17,7 @@ #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" #include "net/ssl/ssl_config_service_defaults.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/url_request_context.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/net/cookie_policy_browsertest.cc b/chrome/browser/net/cookie_policy_browsertest.cc index 499a02a..5d684dd 100644 --- a/chrome/browser/net/cookie_policy_browsertest.cc +++ b/chrome/browser/net/cookie_policy_browsertest.cc @@ -14,7 +14,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" #include "net/dns/mock_host_resolver.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" using content::BrowserThread; diff --git a/chrome/browser/net/ftp_browsertest.cc b/chrome/browser/net/ftp_browsertest.cc index f8d2295..283593e 100644 --- a/chrome/browser/net/ftp_browsertest.cc +++ b/chrome/browser/net/ftp_browsertest.cc @@ -5,7 +5,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "googleurl/src/gurl.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" class FtpBrowserTest : public InProcessBrowserTest { diff --git a/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc b/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc index eb177c5..dc46f8b 100644 --- a/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc +++ b/chrome/browser/net/http_pipelining_compatibility_client_unittest.cc @@ -19,7 +19,7 @@ #include "content/public/test/test_browser_thread.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_test_util.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/net/load_timing_browsertest.cc b/chrome/browser/net/load_timing_browsertest.cc index 4f8f24d..3c01eb4 100644 --- a/chrome/browser/net/load_timing_browsertest.cc +++ b/chrome/browser/net/load_timing_browsertest.cc @@ -22,7 +22,7 @@ #include "content/public/test/browser_test_utils.h" #include "googleurl/src/gurl.h" #include "net/base/load_timing_info.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/url_request_file_job.h" #include "net/url_request/url_request_filter.h" #include "net/url_request/url_request_job_factory.h" diff --git a/chrome/browser/net/network_stats_unittest.cc b/chrome/browser/net/network_stats_unittest.cc index 81c30e8..bb3093a 100644 --- a/chrome/browser/net/network_stats_unittest.cc +++ b/chrome/browser/net/network_stats_unittest.cc @@ -10,7 +10,7 @@ #include "net/base/test_completion_callback.h" #include "net/dns/host_resolver.h" #include "net/dns/mock_host_resolver.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc index 2f1f728..16bd7c5 100644 --- a/chrome/browser/net/proxy_browsertest.cc +++ b/chrome/browser/net/proxy_browsertest.cc @@ -22,7 +22,7 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/test/browser_test_utils.h" #include "net/base/test_data_directory.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace { diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc index 06442c4..a29b924 100644 --- a/chrome/browser/net/websocket_browsertest.cc +++ b/chrome/browser/net/websocket_browsertest.cc @@ -10,7 +10,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" #include "net/base/test_data_directory.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace { diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc index 6ac1965..f524d34 100644 --- a/chrome/browser/notifications/notification_browsertest.cc +++ b/chrome/browser/notifications/notification_browsertest.cc @@ -41,7 +41,7 @@ #include "content/public/test/test_utils.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/policy/test/local_policy_test_server.cc b/chrome/browser/policy/test/local_policy_test_server.cc index 715f7ac..16bb046 100644 --- a/chrome/browser/policy/test/local_policy_test_server.cc +++ b/chrome/browser/policy/test/local_policy_test_server.cc @@ -15,8 +15,8 @@ #include "chrome/browser/policy/cloud/cloud_policy_constants.h" #include "chrome/common/chrome_paths.h" #include "crypto/rsa_private_key.h" -#include "net/test/base_test_server.h" #include "net/test/python_utils.h" +#include "net/test/spawned_test_server/base_test_server.h" namespace policy { diff --git a/chrome/browser/policy/test/local_policy_test_server.h b/chrome/browser/policy/test/local_policy_test_server.h index 43b71fd..aaf6da0 100644 --- a/chrome/browser/policy/test/local_policy_test_server.h +++ b/chrome/browser/policy/test/local_policy_test_server.h @@ -13,7 +13,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/values.h" #include "googleurl/src/gurl.h" -#include "net/test/local_test_server.h" +#include "net/test/spawned_test_server/local_test_server.h" namespace crypto { class RSAPrivateKey; diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc index a8fc2a9..2e00618 100644 --- a/chrome/browser/printing/printing_layout_browsertest.cc +++ b/chrome/browser/printing/printing_layout_browsertest.cc @@ -25,7 +25,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "printing/image.h" #include "printing/printing_test.h" diff --git a/chrome/browser/referrer_policy_browsertest.cc b/chrome/browser/referrer_policy_browsertest.cc index 298ee0a..2df91fb 100644 --- a/chrome/browser/referrer_policy_browsertest.cc +++ b/chrome/browser/referrer_policy_browsertest.cc @@ -18,7 +18,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" // GTK requires a X11-level mouse event to open a context menu correctly. diff --git a/chrome/browser/repost_form_warning_browsertest.cc b/chrome/browser/repost_form_warning_browsertest.cc index 3ab6a8e..67e594a 100644 --- a/chrome/browser/repost_form_warning_browsertest.cc +++ b/chrome/browser/repost_form_warning_browsertest.cc @@ -15,7 +15,7 @@ #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_navigation_observer.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" typedef InProcessBrowserTest RepostFormWarningTest; diff --git a/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc b/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc index 7ead024..6209da7 100644 --- a/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc +++ b/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc @@ -9,7 +9,7 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "net/test/python_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" LocalSafeBrowsingTestServer::LocalSafeBrowsingTestServer( const base::FilePath& data_file) diff --git a/chrome/browser/safe_browsing/local_safebrowsing_test_server.h b/chrome/browser/safe_browsing/local_safebrowsing_test_server.h index e2515ae..e83c07b 100644 --- a/chrome/browser/safe_browsing/local_safebrowsing_test_server.h +++ b/chrome/browser/safe_browsing/local_safebrowsing_test_server.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" -#include "net/test/local_test_server.h" +#include "net/test/spawned_test_server/local_test_server.h" // Runs a Python-based safebrowsing test server on the same machine in which the // LocalSafeBrowsingTestServer runs. diff --git a/chrome/browser/safe_browsing/local_two_phase_testserver.cc b/chrome/browser/safe_browsing/local_two_phase_testserver.cc index 3b7ab5b..b3d4606 100644 --- a/chrome/browser/safe_browsing/local_two_phase_testserver.cc +++ b/chrome/browser/safe_browsing/local_two_phase_testserver.cc @@ -9,7 +9,7 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "net/test/python_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" LocalTwoPhaseTestServer::LocalTwoPhaseTestServer() : net::LocalTestServer(net::SpawnedTestServer::TYPE_HTTP, diff --git a/chrome/browser/safe_browsing/local_two_phase_testserver.h b/chrome/browser/safe_browsing/local_two_phase_testserver.h index b6b49e0..f12d639 100644 --- a/chrome/browser/safe_browsing/local_two_phase_testserver.h +++ b/chrome/browser/safe_browsing/local_two_phase_testserver.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" -#include "net/test/local_test_server.h" +#include "net/test/spawned_test_server/local_test_server.h" // Runs a Python-based two phase upload test server on the same machine in which // the LocalTwoPhaseTestServer runs. diff --git a/chrome/browser/search_engines/template_url_fetcher_unittest.cc b/chrome/browser/search_engines/template_url_fetcher_unittest.cc index 5ace411..765660b 100644 --- a/chrome/browser/search_engines/template_url_fetcher_unittest.cc +++ b/chrome/browser/search_engines/template_url_fetcher_unittest.cc @@ -16,7 +16,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_profile.h" #include "googleurl/src/gurl.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" class TemplateURLFetcherTest; diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc index fae8633..e7988ad 100644 --- a/chrome/browser/sessions/tab_restore_browsertest.cc +++ b/chrome/browser/sessions/tab_restore_browsertest.cc @@ -28,7 +28,7 @@ #include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h" class TabRestoreTest : public InProcessBrowserTest { diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 61d28fb..7fcf500 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -42,7 +42,7 @@ #include "net/base/net_errors.h" #include "net/base/test_data_directory.h" #include "net/cert/cert_status_flags.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #if defined(USE_NSS) #include "net/cert/nss_cert_database.h" diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index accdbfe..657cfa9f 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -48,7 +48,7 @@ #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/browser/tab_contents/view_source_browsertest.cc b/chrome/browser/tab_contents/view_source_browsertest.cc index e90fd87..dbb2e61 100644 --- a/chrome/browser/tab_contents/view_source_browsertest.cc +++ b/chrome/browser/tab_contents/view_source_browsertest.cc @@ -17,7 +17,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "googleurl/src/gurl.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace { const char kTestHtml[] = "files/viewsource/test.html"; diff --git a/chrome/browser/translate/translate_browsertest.cc b/chrome/browser/translate/translate_browsertest.cc index 450d0b3..2119a53 100644 --- a/chrome/browser/translate/translate_browsertest.cc +++ b/chrome/browser/translate/translate_browsertest.cc @@ -19,7 +19,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" #include "net/http/http_status_code.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 1083616..7d6fa94 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -69,7 +69,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/dns/mock_host_resolver.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc index 6d36146..9825fda 100644 --- a/chrome/browser/ui/browser_focus_uitest.cc +++ b/chrome/browser/ui/browser_focus_uitest.cc @@ -37,7 +37,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #if defined(TOOLKIT_VIEWS) #include "chrome/browser/ui/views/frame/browser_view.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc index 5126195..9718e28 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc @@ -13,7 +13,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace { diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc index 70f7ca5..f73fefb 100644 --- a/chrome/browser/ui/pdf/pdf_browsertest.cc +++ b/chrome/browser/ui/pdf/pdf_browsertest.cc @@ -20,7 +20,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/clipboard/clipboard.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/ui/search/instant_test_utils.h b/chrome/browser/ui/search/instant_test_utils.h index aa7c173..251fa97 100644 --- a/chrome/browser/ui/search/instant_test_utils.h +++ b/chrome/browser/ui/search/instant_test_utils.h @@ -19,7 +19,7 @@ #include "chrome/browser/ui/search/instant_overlay_model_observer.h" #include "chrome/common/search_types.h" #include "googleurl/src/gurl.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" class InstantController; class InstantModel; diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc index e7451b7..b623656b 100644 --- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc @@ -20,7 +20,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/views/focus/focus_manager.h" diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc index bbd914a..c54a892 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc +++ b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/service/cloud_print/cloud_print_url_fetcher.h" #include "chrome/service/service_process.h" #include "googleurl/src/gurl.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_status.h" #include "net/url_request/url_request_test_util.h" diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index 4851360..1db254b 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -45,7 +45,7 @@ #include "content/public/test/test_launcher.h" #include "content/public/test/test_navigation_observer.h" #include "net/dns/mock_host_resolver.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "ui/compositor/compositor_switches.h" #if defined(OS_CHROMEOS) diff --git a/chrome/test/perf/mach_ports_test.cc b/chrome/test/perf/mach_ports_test.cc index 583c067..d3d6a02 100644 --- a/chrome/test/perf/mach_ports_test.cc +++ b/chrome/test/perf/mach_ports_test.cc @@ -13,7 +13,7 @@ #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/perf/perf_test.h" #include "chrome/test/ui/ui_perf_test.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace { diff --git a/chrome/test/ppapi/ppapi_test.h b/chrome/test/ppapi/ppapi_test.h index 5540fcb..702fdcd 100644 --- a/chrome/test/ppapi/ppapi_test.h +++ b/chrome/test/ppapi/ppapi_test.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/javascript_test_observer.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace content { class RenderViewHost; diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc index 26b783c..f47b972 100644 --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc @@ -28,7 +28,7 @@ #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "webkit/glue/webdropdata.h" diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc index f3ed766..cb4cf8c 100644 --- a/content/browser/download/download_browsertest.cc +++ b/content/browser/download/download_browsertest.cc @@ -29,7 +29,7 @@ #include "content/test/net/url_request_mock_http_job.h" #include "content/test/net/url_request_slow_download_job.h" #include "googleurl/src/gurl.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc index 26835dd..e8a9042 100644 --- a/content/browser/download/mhtml_generation_browsertest.cc +++ b/content/browser/download/mhtml_generation_browsertest.cc @@ -12,7 +12,7 @@ #include "content/shell/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" namespace content { diff --git a/content/browser/fileapi/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc index 6fe2f8c..d8e55af 100644 --- a/content/browser/fileapi/file_system_browsertest.cc +++ b/content/browser/fileapi/file_system_browsertest.cc @@ -17,7 +17,7 @@ #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "content/test/layout_browsertest.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "webkit/quota/quota_manager.h" using quota::QuotaManager; diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc index 68aded9..43cb267 100644 --- a/content/browser/loader/resource_dispatcher_host_browsertest.cc +++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc @@ -20,7 +20,7 @@ #include "content/test/net/url_request_failed_job.h" #include "content/test/net/url_request_mock_http_job.h" #include "net/base/net_errors.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace content { diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc index 3ae93717..7079ccd 100644 --- a/content/browser/media/webrtc_browsertest.cc +++ b/content/browser/media/webrtc_browsertest.cc @@ -10,7 +10,7 @@ #include "content/shell/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #if defined(OS_WIN) #include "base/win/windows_version.h" diff --git a/content/browser/media/webrtc_internals_browsertest.cc b/content/browser/media/webrtc_internals_browsertest.cc index 5dcb3a9..af3d396 100644 --- a/content/browser/media/webrtc_internals_browsertest.cc +++ b/content/browser/media/webrtc_internals_browsertest.cc @@ -10,7 +10,7 @@ #include "content/shell/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" using std::string; namespace content { diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc index d75dd7a..1170fe5 100644 --- a/content/browser/renderer_host/render_view_host_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_browsertest.cc @@ -16,7 +16,7 @@ #include "content/test/content_browser_test_utils.h" #include "net/base/host_port_pair.h" #include "net/base/net_util.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace content { diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc index 00a2f67..8bb0454 100644 --- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc @@ -28,7 +28,7 @@ #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace content { diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc index cb5d100..5de632a 100644 --- a/content/browser/session_history_browsertest.cc +++ b/content/browser/session_history_browsertest.cc @@ -14,7 +14,7 @@ #include "content/shell/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" namespace content { diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc index f3830f1..cfc5e08 100644 --- a/content/browser/web_contents/web_contents_impl_browsertest.cc +++ b/content/browser/web_contents/web_contents_impl_browsertest.cc @@ -14,7 +14,7 @@ #include "content/shell/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace content { diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc index b6ab62f..54bfab3 100644 --- a/content/browser/worker_host/test/worker_browsertest.cc +++ b/content/browser/worker_host/test/worker_browsertest.cc @@ -24,7 +24,7 @@ #include "content/test/layout_browsertest.h" #include "googleurl/src/gurl.h" #include "net/base/test_data_directory.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace content { diff --git a/content/public/test/browser_test_base.h b/content/public/test/browser_test_base.h index 8ddcba0..952d3c9c 100644 --- a/content/public/test/browser_test_base.h +++ b/content/public/test/browser_test_base.h @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/compiler_specific.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" class CommandLine; diff --git a/net/net.gyp b/net/net.gyp index 5e40c74..de4522a 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -2120,8 +2120,6 @@ 'proxy/proxy_config_service_common_unittest.h', 'socket/socket_test_util.cc', 'socket/socket_test_util.h', - 'test/base_test_server.cc', - 'test/base_test_server.h', 'test/cert_test_util.cc', 'test/cert_test_util.h', 'test/embedded_test_server/http_connection.cc', @@ -2132,19 +2130,21 @@ 'test/embedded_test_server/http_response.h', 'test/embedded_test_server/http_server.cc', 'test/embedded_test_server/http_server.h', - 'test/local_test_server_posix.cc', - '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', - 'test/remote_test_server.h', - 'test/spawned_test_server.h', - 'test/spawner_communicator.cc', - 'test/spawner_communicator.h', + 'test/spawned_test_server/base_test_server.cc', + 'test/spawned_test_server/base_test_server.h', + 'test/spawned_test_server/local_test_server_posix.cc', + 'test/spawned_test_server/local_test_server_win.cc', + 'test/spawned_test_server/local_test_server.cc', + 'test/spawned_test_server/local_test_server.h', + 'test/spawned_test_server/remote_test_server.cc', + 'test/spawned_test_server/remote_test_server.h', + 'test/spawned_test_server/spawned_test_server.h', + 'test/spawned_test_server/spawner_communicator.cc', + 'test/spawned_test_server/spawner_communicator.h', 'url_request/test_url_fetcher_factory.cc', 'url_request/test_url_fetcher_factory.h', 'url_request/url_request_test_util.cc', @@ -2180,10 +2180,10 @@ }], ['OS != "android"', { 'sources!': [ - 'test/remote_test_server.cc', - 'test/remote_test_server.h', - 'test/spawner_communicator.cc', - 'test/spawner_communicator.h', + 'test/spawned_test_server/remote_test_server.cc', + 'test/spawned_test_server/remote_test_server.h', + 'test/spawned_test_server/spawner_communicator.cc', + 'test/spawned_test_server/spawner_communicator.h', ], }], ['OS == "ios"', { diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc b/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc index b192dbb..8c81cce 100644 --- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc +++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc @@ -12,7 +12,7 @@ #include "net/base/test_completion_callback.h" #include "net/proxy/mock_proxy_script_fetcher.h" #include "net/proxy/proxy_script_fetcher_impl.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/proxy/proxy_resolver_perftest.cc b/net/proxy/proxy_resolver_perftest.cc index 0a0f2ec..1d9834a 100644 --- a/net/proxy/proxy_resolver_perftest.cc +++ b/net/proxy/proxy_resolver_perftest.cc @@ -12,7 +12,7 @@ #include "net/dns/mock_host_resolver.h" #include "net/proxy/proxy_info.h" #include "net/proxy/proxy_resolver_v8.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_WIN) diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc index 3c23528..ab04aba 100644 --- a/net/proxy/proxy_script_fetcher_impl_unittest.cc +++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc @@ -20,7 +20,7 @@ #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" #include "net/ssl/ssl_config_service_defaults.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_file_job.h" #include "net/url_request/url_request_job_factory_impl.h" diff --git a/net/socket/ssl_client_socket_openssl_unittest.cc b/net/socket/ssl_client_socket_openssl_unittest.cc index 82c936f..80f7a8f 100644 --- a/net/socket/ssl_client_socket_openssl_unittest.cc +++ b/net/socket/ssl_client_socket_openssl_unittest.cc @@ -37,7 +37,7 @@ #include "net/ssl/ssl_cert_request_info.h" #include "net/ssl/ssl_config_service.h" #include "net/test/cert_test_util.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index cfb1f16..7b7eca8b 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -23,7 +23,7 @@ #include "net/ssl/ssl_cert_request_info.h" #include "net/ssl/ssl_config_service.h" #include "net/test/cert_test_util.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" 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_ diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc index b765dd4..f0f9e6b 100644 --- a/net/tools/testserver/run_testserver.cc +++ b/net/tools/testserver/run_testserver.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" static void PrintUsage() { printf("run_testserver --doc-root=relpath\n" diff --git a/net/url_request/url_fetcher_impl_unittest.cc b/net/url_request/url_fetcher_impl_unittest.cc index ecc9dbb..f45c6e7 100644 --- a/net/url_request/url_fetcher_impl_unittest.cc +++ b/net/url_request/url_fetcher_impl_unittest.cc @@ -19,7 +19,7 @@ #include "net/base/network_change_notifier.h" #include "net/dns/mock_host_resolver.h" #include "net/http/http_response_headers.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_test_util.h" diff --git a/net/url_request/url_request_context_builder_unittest.cc b/net/url_request/url_request_context_builder_unittest.cc index a3ffb95..b7cbcbe 100644 --- a/net/url_request/url_request_context_builder_unittest.cc +++ b/net/url_request/url_request_context_builder_unittest.cc @@ -5,7 +5,7 @@ #include "net/url_request/url_request_context_builder.h" #include "build/build_config.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index ec7a349..dec3ba2 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -57,7 +57,7 @@ #include "net/socket/ssl_client_socket.h" #include "net/ssl/ssl_connection_status_flags.h" #include "net/test/cert_test_util.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/ftp_protocol_handler.h" #include "net/url_request/static_http_user_agent_settings.h" #include "net/url_request/url_request.h" diff --git a/sync/internal_api/http_bridge_unittest.cc b/sync/internal_api/http_bridge_unittest.cc index b7dbe99..605d9c0 100644 --- a/sync/internal_api/http_bridge_unittest.cc +++ b/sync/internal_api/http_bridge_unittest.cc @@ -5,7 +5,7 @@ #include "base/message_loop_proxy.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher_delegate.h" #include "net/url_request/url_request_test_util.h" diff --git a/sync/test/local_sync_test_server.cc b/sync/test/local_sync_test_server.cc index 4f9242b..6b3e37f 100644 --- a/sync/test/local_sync_test_server.cc +++ b/sync/test/local_sync_test_server.cc @@ -9,7 +9,7 @@ #include "base/string_number_conversions.h" #include "base/values.h" #include "net/test/python_utils.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" namespace syncer { diff --git a/sync/test/local_sync_test_server.h b/sync/test/local_sync_test_server.h index 4e829ec..3cd9e55 100644 --- a/sync/test/local_sync_test_server.h +++ b/sync/test/local_sync_test_server.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "net/test/local_test_server.h" +#include "net/test/spawned_test_server/local_test_server.h" namespace syncer { diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc index b2e5f16..3fe37c7 100644 --- a/webkit/support/test_webkit_platform_support.cc +++ b/webkit/support/test_webkit_platform_support.cc @@ -15,7 +15,7 @@ #include "media/base/media.h" #include "net/cookies/cookie_monster.h" #include "net/http/http_cache.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebAudioDevice.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h" diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index 13c07ff..7f53d48 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -25,7 +25,7 @@ #include "net/cookies/cookie_monster.h" #include "net/http/http_cache.h" #include "net/http/http_util.h" -#include "net/test/spawned_test_server.h" +#include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/url_request_context.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h" |