diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 23:56:38 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-23 23:56:38 +0000 |
| commit | 820aca8d90c893f7e4e0bd101423170c3cea52da (patch) | |
| tree | 764a6af9f2539560a48f00d47eb8767719042fac /net/tools | |
| parent | f1acf0627a4d0c85d08a5f2e90dfb8173f7e038c (diff) | |
| download | chromium_src-820aca8d90c893f7e4e0bd101423170c3cea52da.zip chromium_src-820aca8d90c893f7e4e0bd101423170c3cea52da.tar.gz chromium_src-820aca8d90c893f7e4e0bd101423170c3cea52da.tar.bz2 | |
fix run_testserver init again.
We must init dependencies of TestTimeouts::Initialize before calling it. Namely CommandLine::Init and InitLogging.
Not sure how/what changed since my last patch, but this stopped working again due to order of calls.
BUG=none
TEST=build + run run_testserver. no crash.
Review URL: http://codereview.chromium.org/7244017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90296 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/testserver/run_testserver.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc index c4e04b7..f9a70ba 100644 --- a/net/tools/testserver/run_testserver.cc +++ b/net/tools/testserver/run_testserver.cc @@ -22,8 +22,6 @@ 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(); @@ -38,6 +36,8 @@ int main(int argc, const char* argv[]) { return -1; } + TestTimeouts::Initialize(); + if (command_line->GetSwitchCount() == 0 || command_line->HasSwitch("help")) { PrintUsage(); |