Revert 159815 - Move around some ScopedOleInitializers in hopes of reducing the number of duplicate initializations, which are noticeable now that I've added logging for them.

I'm trying to track down a mysterious XP-only failure in OneClickSigninHelperTest.
If reverting this change doesn't fix the problem, I'll un-revert.

BUG=none
TEST=Fewer "Multiple OleInitialize..." messages in tests
TBR=phajdan.jr
Review URL: https://codereview.chromium.org/11036010

TBR=pkasting@chromium.org
Review URL: https://codereview.chromium.org/11030020

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

5 files changed, 21 insertions, 14 deletions

diff --git a/chrome/test/base/chrome_test_suite.h b/chrome/test/base/chrome_test_suite.h
index 2978f89..756b22e 100644
--- a/chrome/test/base/chrome_test_suite.h
+++ b/chrome/test/base/chrome_test_suite.h
@@ -11,6 +11,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "content/public/test/content_test_suite_base.h"
 
+#if defined(OS_WIN)
+#include "ui/base/win/scoped_ole_initializer.h"
+#endif
+
 namespace base {
 class StatsTable;
 }
@@ -35,6 +39,10 @@ class ChromeTestSuite : public content::ContentTestSuiteBase {
 
   std::string stats_filename_;
   scoped_ptr<base::StatsTable> stats_table_;
+
+#if defined(OS_WIN)
+  ui::ScopedOleInitializer ole_initializer_;
+#endif
 };
 
 #endif  // CHROME_TEST_BASE_CHROME_TEST_SUITE_H_
diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc
index 421d738..67a00f3 100644
--- a/content/public/test/test_renderer_host.cc
+++ b/content/public/test/test_renderer_host.cc
@@ -127,9 +127,6 @@ void RenderViewHostTestHarness::Reload() {
 }
 
 void RenderViewHostTestHarness::SetUp() {
-#if defined(OS_WIN)
-  ole_initializer_.reset(new ui::ScopedOleInitializer());
-#endif
 #if defined(USE_AURA)
   aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
   aura_test_helper_->SetUp();
@@ -153,10 +150,6 @@ void RenderViewHostTestHarness::TearDown() {
   // Release the browser context on the UI thread.
   message_loop_.DeleteSoon(FROM_HERE, browser_context_.release());
   message_loop_.RunAllPending();
-
-#if defined(OS_WIN)
-  ole_initializer_.reset();
-#endif
 }
 
 void RenderViewHostTestHarness::SetRenderProcessHostFactory(
diff --git a/content/public/test/test_renderer_host.h b/content/public/test/test_renderer_host.h
index 415d237..a580cf6 100644
--- a/content/public/test/test_renderer_host.h
+++ b/content/public/test/test_renderer_host.h
@@ -11,10 +11,6 @@
 #include "content/public/common/page_transition_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_WIN)
-#include "ui/base/win/scoped_ole_initializer.h"
-#endif
-
 #if defined(USE_AURA)
 #include "ui/aura/test/aura_test_helper.h"
 #endif
@@ -175,9 +171,6 @@ class RenderViewHostTestHarness : public testing::Test {
   // web_contents() and SetContents() are virtual and may be
   // overridden by subclasses.
   scoped_ptr<WebContents> contents_;
-#if defined(OS_WIN)
-  scoped_ptr<ui::ScopedOleInitializer> ole_initializer_;
-#endif
 #if defined(USE_AURA)
   scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
 #endif
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 1f2bece..82798be 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -21,6 +21,7 @@
 #if defined(OS_WIN)
 #include "content/public/app/startup_helper_win.h"
 #include "sandbox/win/src/sandbox_types.h"
+#include "ui/base/win/scoped_ole_initializer.h"
 #endif  // defined(OS_WIN)
 
 namespace content {
@@ -77,6 +78,10 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase {
     return new ShellContentClient();
   }
 
+#if defined(OS_WIN)
+  ui::ScopedOleInitializer ole_initializer_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(ContentBrowserTestSuite);
 };
 
diff --git a/ui/aura/test/aura_test_helper.h b/ui/aura/test/aura_test_helper.h
index 94716cd..1a14e58 100644
--- a/ui/aura/test/aura_test_helper.h
+++ b/ui/aura/test/aura_test_helper.h
@@ -8,6 +8,10 @@
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 
+#if defined(OS_WIN)
+#include "ui/base/win/scoped_ole_initializer.h"
+#endif
+
 class MessageLoopForUI;
 
 namespace ui {
@@ -56,6 +60,10 @@ class AuraTestHelper {
   scoped_ptr<ui::InputMethod> test_input_method_;
   scoped_ptr<FocusManager> focus_manager_;
 
+#if defined(OS_WIN)
+  ui::ScopedOleInitializer ole_initializer_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(AuraTestHelper);
 };