summaryrefslogtreecommitdiffstats
path: root/chrome/test/browser_with_test_window_test.cc
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-30 19:32:39 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-30 19:32:39 +0000
commitd2ad262d31b75f74e9500500459e48724be599bc (patch)
treea0dcdcfc8771be718980e6309c0d397e363a52a5 /chrome/test/browser_with_test_window_test.cc
parentc21ce63b69398acfc5df3e033d9e90e880a66822 (diff)
downloadchromium_src-d2ad262d31b75f74e9500500459e48724be599bc.zip
chromium_src-d2ad262d31b75f74e9500500459e48724be599bc.tar.gz
chromium_src-d2ad262d31b75f74e9500500459e48724be599bc.tar.bz2
Revert 33301 and 33305 due to unit_tests breakage.
TBR=pawel Review URL: http://codereview.chromium.org/453007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/browser_with_test_window_test.cc')
-rw-r--r--chrome/test/browser_with_test_window_test.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc
index fe52160..8dede7c 100644
--- a/chrome/test/browser_with_test_window_test.cc
+++ b/chrome/test/browser_with_test_window_test.cc
@@ -12,6 +12,9 @@
BrowserWithTestWindowTest::BrowserWithTestWindowTest()
: rph_factory_(),
rvh_factory_(&rph_factory_) {
+#if defined(OS_WIN)
+ OleInitialize(NULL);
+#endif
}
void BrowserWithTestWindowTest::SetUp() {
@@ -36,6 +39,10 @@ BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {
MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask);
MessageLoop::current()->Run();
+
+#if defined(OS_WIN)
+ OleUninitialize();
+#endif
}
TestRenderViewHost* BrowserWithTestWindowTest::TestRenderViewHostForTab(