2 files changed, 7 insertions, 3 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(
diff --git a/chrome/test/browser_with_test_window_test.h b/chrome/test/browser_with_test_window_test.h
index 0223bd6..835bdeb 100644
--- a/chrome/test/browser_with_test_window_test.h
+++ b/chrome/test/browser_with_test_window_test.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/message_loop.h"
-#include "chrome/app/scoped_ole_initializer.h"
 #include "chrome/browser/renderer_host/test/test_render_view_host.h"
 #include "chrome/test/test_browser_window.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -97,8 +96,6 @@ class BrowserWithTestWindowTest : public testing::Test {
   MockRenderProcessHostFactory rph_factory_;
   TestRenderViewHostFactory rvh_factory_;
 
-  ScopedOleInitializer ole_initializer_;
-
   DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
 };