[GTTF] Reduce header dependencies in chrome.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/454004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33301 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 7 deletions

diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc
index 8dede7c..fe52160 100644
--- a/chrome/test/browser_with_test_window_test.cc
+++ b/chrome/test/browser_with_test_window_test.cc
@@ -12,9 +12,6 @@
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
     : rph_factory_(),
       rvh_factory_(&rph_factory_) {
-#if defined(OS_WIN)
-  OleInitialize(NULL);
-#endif
 }
 
 void BrowserWithTestWindowTest::SetUp() {
@@ -39,10 +36,6 @@ 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 835bdeb..0223bd6 100644
--- a/chrome/test/browser_with_test_window_test.h
+++ b/chrome/test/browser_with_test_window_test.h
@@ -8,6 +8,7 @@
 #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"
@@ -96,6 +97,8 @@ class BrowserWithTestWindowTest : public testing::Test {
   MockRenderProcessHostFactory rph_factory_;
   TestRenderViewHostFactory rvh_factory_;
 
+  ScopedOleInitializer ole_initializer_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
 };