Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: chrome/browser/ssl/ssl_error_handler_unittest.cc

Issue 2486313002: Correct net::EmbeddedTestServer usage in some SSL related tests. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/ssl_errors/error_classification_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_error_handler_unittest.cc
diff --git a/chrome/browser/ssl/ssl_error_handler_unittest.cc b/chrome/browser/ssl/ssl_error_handler_unittest.cc
index f6693e229c7b0b1ee0f11ef8f00d30adad612a05..ef1b5abbaefd7bdeb0a0fa14c388a88bad1d822c 100644
--- a/chrome/browser/ssl/ssl_error_handler_unittest.cc
+++ b/chrome/browser/ssl/ssl_error_handler_unittest.cc
@@ -446,9 +446,9 @@ TEST_F(SSLErrorHandlerDateInvalidTest, TimeQueryStarted) {
// Enable network time queries and handle the error. A bad clock interstitial
// should be shown.
- EXPECT_TRUE(test_server()->Start());
test_server()->RegisterRequestHandler(
base::Bind(&network_time::GoodTimeResponseHandler));
+ EXPECT_TRUE(test_server()->Start());
tracker()->SetTimeServerURLForTesting(test_server()->GetURL("/"));
field_trial_test()->SetNetworkQueriesWithVariationsService(
true, 0.0, network_time::FieldTrialTest::FETCHES_ON_DEMAND_ONLY);
@@ -500,10 +500,10 @@ TEST_F(SSLErrorHandlerDateInvalidTest, TimeQueryHangs) {
// Enable network time queries and handle the error. Because the
// network time cannot be determined before the timer elapses, an SSL
// interstitial should be shown.
- EXPECT_TRUE(test_server()->Start());
base::RunLoop wait_for_time_query_loop;
test_server()->RegisterRequestHandler(
base::Bind(&WaitForRequest, wait_for_time_query_loop.QuitClosure()));
+ EXPECT_TRUE(test_server()->Start());
tracker()->SetTimeServerURLForTesting(test_server()->GetURL("/"));
field_trial_test()->SetNetworkQueriesWithVariationsService(
true, 0.0, network_time::FieldTrialTest::FETCHES_ON_DEMAND_ONLY);
« no previous file with comments | « no previous file | components/ssl_errors/error_classification_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698