Eliminate duplicate COM and OLE initializations.

This is take 2; the original patch ( http://crrev.com/159815 ), which only dealt with OLE, broke a few tests.  The OneClickSignIn tests were skipping the RenderViewHostTestHarness SetUp() method, while the Accessibility tests directly muck with Widgets and thus have to manually init OLE.

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

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

3 files changed, 14 insertions, 12 deletions

diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index 7bef316..55bb95d 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -24,7 +24,6 @@
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_co_mem.h"
-#include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
@@ -415,9 +414,6 @@ void IEImporter::StartImport(const importer::SourceProfile& source_profile,
 
   bridge_->NotifyStarted();
 
-  // Some IE settings (such as Protected Storage) are obtained via COM APIs.
-  base::win::ScopedCOMInitializer com_initializer;
-
   if ((items & importer::HOME_PAGE) && !cancelled())
     ImportHomepage();  // Doesn't have a UI item.
   // The order here is important!
diff --git a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
index 53caf11..4aa9ae7 100644
--- a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
@@ -24,6 +24,10 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.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
@@ -89,6 +93,9 @@ class AccessibilityEventRouterViewsTest
   }
 
   virtual void SetUp() {
+#if defined(OS_WIN)
+    ole_initializer_.reset(new ui::ScopedOleInitializer());
+#endif
     views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate();
 #if defined(USE_AURA)
     aura_test_helper_.reset(new aura::test::AuraTestHelper(&message_loop_));
@@ -107,6 +114,10 @@ class AccessibilityEventRouterViewsTest
     // forces it to be deleted now, so we don't have any memory leaks
     // when this method exits.
     MessageLoop::current()->RunAllPending();
+
+#if defined(OS_WIN)
+    ole_initializer_.reset();
+#endif
   }
 
   views::Widget* CreateWindowWithContents(views::View* contents) {
@@ -133,6 +144,9 @@ class AccessibilityEventRouterViewsTest
   int focus_event_count_;
   std::string last_control_name_;
   std::string last_control_context_;
+#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/chrome/test/base/chrome_test_suite.h b/chrome/test/base/chrome_test_suite.h
index 756b22e..2978f89 100644
--- a/chrome/test/base/chrome_test_suite.h
+++ b/chrome/test/base/chrome_test_suite.h
@@ -11,10 +11,6 @@
 #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;
 }
@@ -39,10 +35,6 @@ 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_