diff options
Diffstat (limited to 'chrome/browser/safe_browsing')
4 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc b/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc index 8140105..7ead024 100644 --- a/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc +++ b/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc @@ -9,12 +9,12 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "net/test/python_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" LocalSafeBrowsingTestServer::LocalSafeBrowsingTestServer( const base::FilePath& data_file) - : net::LocalTestServer(net::TestServer::TYPE_HTTP, - net::TestServer::kLocalhost, + : net::LocalTestServer(net::SpawnedTestServer::TYPE_HTTP, + net::SpawnedTestServer::kLocalhost, base::FilePath()), data_file_(data_file) { } diff --git a/chrome/browser/safe_browsing/local_two_phase_testserver.cc b/chrome/browser/safe_browsing/local_two_phase_testserver.cc index 567bb2a..3b7ab5b 100644 --- a/chrome/browser/safe_browsing/local_two_phase_testserver.cc +++ b/chrome/browser/safe_browsing/local_two_phase_testserver.cc @@ -9,11 +9,11 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "net/test/python_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" LocalTwoPhaseTestServer::LocalTwoPhaseTestServer() - : net::LocalTestServer(net::TestServer::TYPE_HTTP, - net::TestServer::kLocalhost, + : net::LocalTestServer(net::SpawnedTestServer::TYPE_HTTP, + net::SpawnedTestServer::kLocalhost, base::FilePath()) { } diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc index 9a312db..9afe945 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc @@ -747,8 +747,8 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ReportingDisabled) { browser()->profile()->GetPrefs()->SetBoolean( prefs::kSafeBrowsingReportingEnabled, true); - net::TestServer https_server( - net::TestServer::TYPE_HTTPS, net::TestServer::kLocalhost, + net::SpawnedTestServer https_server( + net::SpawnedTestServer::TYPE_HTTPS, net::SpawnedTestServer::kLocalhost, base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))); ASSERT_TRUE(https_server.Start()); GURL url = https_server.GetURL(kEmptyPage); diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index d25ebe4..e96f565 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -207,7 +207,7 @@ class SafeBrowsingServerTest : public InProcessBrowserTest { return database_manager()->safe_browsing_thread_->message_loop(); } - const net::TestServer& test_server() const { + const net::SpawnedTestServer& test_server() const { return *test_server_; } @@ -264,7 +264,7 @@ class SafeBrowsingServerTest : public InProcessBrowserTest { private: SafeBrowsingService* safe_browsing_service_; - scoped_ptr<net::TestServer> test_server_; + scoped_ptr<net::SpawnedTestServer> test_server_; // Protects all variables below since they are read on UI thread // but updated on IO thread or safebrowsing thread. @@ -370,7 +370,7 @@ class SafeBrowsingServerTestHelper // Calls test server to fetch database for verification. net::URLRequestStatus::Status FetchDBToVerify( - const net::TestServer& test_server, + const net::SpawnedTestServer& test_server, int test_step) { // TODO(lzheng): Remove chunk_type=add once it is not needed by the server. std::string path = base::StringPrintf( @@ -381,7 +381,7 @@ class SafeBrowsingServerTestHelper // Calls test server to fetch URLs for verification. net::URLRequestStatus::Status FetchUrlsToVerify( - const net::TestServer& test_server, + const net::SpawnedTestServer& test_server, int test_step) { std::string path = base::StringPrintf( "%s?client=chromium&appver=1.0&pver=2.2&test_step=%d", @@ -393,7 +393,7 @@ class SafeBrowsingServerTestHelper // bad URL that server expects test to fetch full hash but the test didn't, // this verification will fail. net::URLRequestStatus::Status VerifyTestComplete( - const net::TestServer& test_server, + const net::SpawnedTestServer& test_server, int test_step) { std::string path = base::StringPrintf( "%s?test_step=%d", kTestCompletePath, test_step); |