diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 23:32:25 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 23:32:25 +0000 |
| commit | 897e712dd5645f49eae7f5d4bd28866440949d30 (patch) | |
| tree | 20aae1b6bd2f05b2277f246475b610eb2ebb32bc /net/test/spawned_test_server | |
| parent | 425fbf76a6833967b4f54e50a73bc5752f4b68d5 (diff) | |
| download | chromium_src-897e712dd5645f49eae7f5d4bd28866440949d30.zip chromium_src-897e712dd5645f49eae7f5d4bd28866440949d30.tar.gz chromium_src-897e712dd5645f49eae7f5d4bd28866440949d30.tar.bz2 | |
Revert 260201 "Give localserver time to shut down"
> Give localserver time to shut down
>
> On machines with slow I/O, the localserver might not shut down immediately,
> wait for it if necessary.
>
> BUG=
>
> Review URL: https://codereview.chromium.org/145873004
TBR=sigbjorn@opera.com
Review URL: https://codereview.chromium.org/217913002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260300 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test/spawned_test_server')
| -rw-r--r-- | net/test/spawned_test_server/local_test_server.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/test/spawned_test_server/local_test_server.cc b/net/test/spawned_test_server/local_test_server.cc index ee86d74..6516136 100644 --- a/net/test/spawned_test_server/local_test_server.cc +++ b/net/test/spawned_test_server/local_test_server.cc @@ -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 @@ bool LocalTestServer::Stop() { #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 |