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

Unified Diff: trunk/src/net/test/spawned_test_server/local_test_server.cc

Issue 217913002: Revert 260201 "Give localserver time to shut down" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 months 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/net/test/spawned_test_server/local_test_server.cc
===================================================================
--- trunk/src/net/test/spawned_test_server/local_test_server.cc (revision 260299)
+++ trunk/src/net/test/spawned_test_server/local_test_server.cc (working copy)
@@ -10,7 +10,6 @@
#include "base/path_service.h"
#include "base/process/kill.h"
#include "base/strings/string_number_conversions.h"
-#include "base/test/test_timeouts.h"
#include "base/values.h"
#include "net/base/host_port_pair.h"
#include "net/base/net_errors.h"
@@ -127,10 +126,6 @@
#if defined(OS_WIN)
// This kills all the processes in the job object.
- TerminateJobObject(job_handle_.Get(), 1);
- // This is done asynchronously so wait a bit for the processes to be killed.
- WaitForSingleObject(job_handle_.Get(),
- TestTimeouts::action_timeout().InMilliseconds());
job_handle_.Close();
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698