summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-18 11:53:42 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-18 11:53:42 +0000
commitada02db3c5720f39b377d30a372590eab763a910 (patch)
tree50264c9cb809d1e0183e140ca9aa31c8fcb46bf5 /net/tools
parent4866af2d6d75b4dd0276de87e0d095becf76bf8a (diff)
downloadchromium_src-ada02db3c5720f39b377d30a372590eab763a910.zip
chromium_src-ada02db3c5720f39b377d30a372590eab763a910.tar.gz
chromium_src-ada02db3c5720f39b377d30a372590eab763a910.tar.bz2
initialize TestTimeouts for python test server (run_testserver target)
BUG= TEST=run_testserver doesn't crash Review URL: http://codereview.chromium.org/7187025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rw-r--r--net/tools/testserver/run_testserver.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc
index 06fa577..c4e04b7 100644
--- a/net/tools/testserver/run_testserver.cc
+++ b/net/tools/testserver/run_testserver.cc
@@ -9,6 +9,7 @@
#include "base/file_path.h"
#include "base/logging.h"
#include "base/message_loop.h"
+#include "base/test/test_timeouts.h"
#include "base/utf_string_conversions.h"
#include "net/test/test_server.h"
@@ -21,6 +22,8 @@ int main(int argc, const char* argv[]) {
base::AtExitManager at_exit_manager;
MessageLoopForIO message_loop;
+ TestTimeouts::Initialize();
+
// Process command line
CommandLine::Init(argc, argv);
CommandLine* command_line = CommandLine::ForCurrentProcess();