diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 02:02:46 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 02:02:46 +0000 |
| commit | 1e187afa75fe66d8525651c1f395c40e8227844d (patch) | |
| tree | 28a2f0ea9a7c27305af52e8382b471a321a9af8b /chrome/test/unit | |
| parent | 67a54912d23c2a0c87065e9a876971fda54edf70 (diff) | |
| download | chromium_src-1e187afa75fe66d8525651c1f395c40e8227844d.zip chromium_src-1e187afa75fe66d8525651c1f395c40e8227844d.tar.gz chromium_src-1e187afa75fe66d8525651c1f395c40e8227844d.tar.bz2 | |
Reverting 10318.
Reverting again...
Review URL: http://codereview.chromium.org/28106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/unit')
| -rw-r--r-- | chrome/test/unit/chrome_test_suite.h | 4 | ||||
| -rw-r--r-- | chrome/test/unit/unittests.vcproj | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h index 3382d972..79c5e19 100644 --- a/chrome/test/unit/chrome_test_suite.h +++ b/chrome/test/unit/chrome_test_suite.h @@ -12,7 +12,6 @@ #include "base/path_service.h" #include "base/scoped_nsautorelease_pool.h" #include "base/test_suite.h" -#include "chrome/app/scoped_ole_initializer.h" #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -79,12 +78,11 @@ protected: // Tear down shared StatsTable; prevents unit_tests from leaking it. StatsTable::set_current(NULL); delete stats_table_; - + TestSuite::Shutdown(); } StatsTable* stats_table_; - ScopedOleInitializer ole_initializer_; }; #endif // CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_ diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index fbc182b..3011530 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -999,10 +999,6 @@ > </File> </Filter> - <File - RelativePath="..\..\browser\browser_focus_uitest.cc" - > - </File> </Files> <Globals> </Globals> |