diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 02:10:54 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 02:10:54 +0000 |
| commit | a7b4ee1d5539f432ca795e60cafd76a68aebab45 (patch) | |
| tree | 21155bef8d181fe0ef442bfa5a38a99e6a11ceb6 /base | |
| parent | 2d877a1b47407b4c224d10bd0ed189e14a54f489 (diff) | |
| download | chromium_src-a7b4ee1d5539f432ca795e60cafd76a68aebab45.zip chromium_src-a7b4ee1d5539f432ca795e60cafd76a68aebab45.tar.gz chromium_src-a7b4ee1d5539f432ca795e60cafd76a68aebab45.tar.bz2 | |
Revert 114320 (broke chrome_frame_tests) - Enable ChromeFrame net tests for IE versions 8 and below. Changes include the following:-
1. Get rid of the dummy AtlModule registration in the net test suite. This is no longer needed
as there is a module instance instantiated by the content code.
2. The test suite class now instantiates the ShadowAtExitManager class which allows nesting of AtExitManager
instances. This is needed because the ChromeFrame net tests suite now calls into ContentMain which also
instantiates an AtExitManager instance.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=105435
BUG=105435
TEST=ChromeFrame net tests should now run on the builders.
Review URL: http://codereview.chromium.org/8898026
TBR=ananta@chromium.org
Review URL: http://codereview.chromium.org/8937020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/test/test_suite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/test/test_suite.h b/base/test/test_suite.h index 6dfca0e..2572756 100644 --- a/base/test/test_suite.h +++ b/base/test/test_suite.h @@ -75,7 +75,7 @@ class TestSuite { // Make sure that we setup an AtExitManager so Singleton objects will be // destroyed. - base::ShadowingAtExitManager at_exit_manager_; + base::AtExitManager at_exit_manager_; DISALLOW_COPY_AND_ASSIGN(TestSuite); }; |