Correct net::EmbeddedTestServer usage in some SSL related tests.

chrome/browser/ssl/ssl_error_handler_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ssl/ssl_error_handler.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
@@ skipping 428 matching lines @@
 }
 
 TEST_F(SSLErrorHandlerDateInvalidTest, TimeQueryStarted) {
   base::Time network_time;
   base::TimeDelta uncertainty;
   EXPECT_EQ(network_time::NetworkTimeTracker::NETWORK_TIME_NO_SYNC_ATTEMPT,
             tracker()->GetNetworkTime(&network_time, &uncertainty));
 
   // 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);
   error_handler()->StartHandlingError();
 
   EXPECT_TRUE(error_handler()->IsTimerRunning());
   tracker()->WaitForFetchForTesting(123123123);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_TRUE(error_handler()->bad_clock_interstitial_shown());
@@ skipping 31 matching lines @@
 // the system clock times out (e.g. because a network time query hangs).
 TEST_F(SSLErrorHandlerDateInvalidTest, TimeQueryHangs) {
   base::Time network_time;
   base::TimeDelta uncertainty;
   EXPECT_EQ(network_time::NetworkTimeTracker::NETWORK_TIME_NO_SYNC_ATTEMPT,
             tracker()->GetNetworkTime(&network_time, &uncertainty));
 
   // 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);
   error_handler()->StartHandlingError();
   EXPECT_TRUE(error_handler()->IsTimerRunning());
   wait_for_time_query_loop.Run();
   base::RunLoop().RunUntilIdle();
 
   EXPECT_FALSE(error_handler()->bad_clock_interstitial_shown());
   EXPECT_TRUE(error_handler()->ssl_interstitial_shown());
   EXPECT_FALSE(error_handler()->IsTimerRunning());
 
   // Clear the error handler to test that, when the request completes,
   // it doesn't try to call a callback on a deleted SSLErrorHandler.
   ClearErrorHandler();
 
   // Shut down the server to cancel the pending request.
   ASSERT_TRUE(test_server()->ShutdownAndWaitUntilComplete());
   tracker()->WaitForFetchForTesting(123123123);
 }