summaryrefslogtreecommitdiffstats
path: root/chrome/test/unit
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-24 22:06:22 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-24 22:06:22 +0000
commit50613309535025abb3bb030d5f13fac2fff235c6 (patch)
tree987484cd98074d92b5a4a7876bd1928bd643c7f7 /chrome/test/unit
parentd5c4f386029ab19cec0f4d76bede0c4d2975d431 (diff)
downloadchromium_src-50613309535025abb3bb030d5f13fac2fff235c6.zip
chromium_src-50613309535025abb3bb030d5f13fac2fff235c6.tar.gz
chromium_src-50613309535025abb3bb030d5f13fac2fff235c6.tar.bz2
Converted the browser focus interactive ui tests to be in process.
Some testing I did as part of my in-progress focus refactoring seemed to indicate they are flacky. With this CL, they now mostly use the blocking calls when simulating UI actions (instead of relying on timers). BUG=None TEST=Run the tests BrowserFocusTest.* in the interactive tests. Review URL: http://codereview.chromium.org/27083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/unit')
-rw-r--r--chrome/test/unit/chrome_test_suite.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h
index 79c5e19..3382d972 100644
--- a/chrome/test/unit/chrome_test_suite.h
+++ b/chrome/test/unit/chrome_test_suite.h
@@ -12,6 +12,7 @@
#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"
@@ -78,11 +79,12 @@ 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_