diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 20:20:55 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-27 20:20:55 +0000 |
| commit | 2870e098bfc45deb05458779367b3916c659fa7e (patch) | |
| tree | 2a597c5735c9576179715bc0a190e81380c58fad /chrome_frame/test | |
| parent | 126f4fbdf4245f4b98b85afc3d9d769d024e55e8 (diff) | |
| download | chromium_src-2870e098bfc45deb05458779367b3916c659fa7e.zip chromium_src-2870e098bfc45deb05458779367b3916c659fa7e.tar.gz chromium_src-2870e098bfc45deb05458779367b3916c659fa7e.tar.bz2 | |
The crash service starup code in the cf net tests suite relies on the AtExitManager instance being around.
Moving this to after the test suite initialization fixes the DCHECKs firing in debug builds if the crash
service isn't already running.
BUG=none
TEST=cf net tests should run in debug builds without DCHECKs
TBR=robertshield
Review URL: http://codereview.chromium.org/7230028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 12d4d96..d85cc0c 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -552,8 +552,6 @@ int main(int argc, char** argv) { return 0; } - base::ProcessHandle crash_service = chrome_frame_test::StartCrashService(); - google_breakpad::scoped_ptr<google_breakpad::ExceptionHandler> breakpad( InitializeCrashReporting(HEADLESS)); @@ -563,6 +561,8 @@ int main(int argc, char** argv) { // below require. So we have to instantiate this first. CFUrlRequestUnittestRunner test_suite(argc, argv); + base::ProcessHandle crash_service = chrome_frame_test::StartCrashService(); + WindowWatchdog watchdog; // See url_request_unittest.cc for these credentials. SupplyProxyCredentials credentials("user", "secret"); |