Move scoped_ole_initializer.h to ui/base/win and clean up ole initialization/uninitialization.

chrome/test/base/browser_with_test_window_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/browser_with_test_window_test.h"
 
-#if defined(OS_WIN)
-#include <ole2.h>
-#endif  // defined(OS_WIN)
-
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_activation_client.h"
 #include "ui/aura/test/test_stacking_client.h"
 #endif
 
 using content::BrowserThread;
 using content::NavigationController;
 using content::TestRenderViewHost;
 using content::WebContents;
 
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
     : ui_thread_(BrowserThread::UI, message_loop()),
       file_thread_(BrowserThread::FILE, message_loop()),
       file_user_blocking_thread_(
           BrowserThread::FILE_USER_BLOCKING, message_loop()),
       rph_factory_(),
       rvh_factory_(&rph_factory_) {
-#if defined(OS_WIN)
-  OleInitialize(NULL);
-#endif
 }
 
 void BrowserWithTestWindowTest::SetUp() {
   testing::Test::SetUp();
 
   profile_.reset(CreateProfile());
   browser_.reset(new Browser(Browser::TYPE_TABBED, profile()));
   window_.reset(new TestBrowserWindow(browser()));
   browser_->SetWindowForTesting(window_.get());
 #if defined(USE_AURA)
@@ skipping 15 matching lines @@
 }
 
 BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {
   // A Task is leaked if we don't destroy everything, then run the message
   // loop.
   DestroyBrowser();
   profile_.reset(NULL);
 
   MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   MessageLoop::current()->Run();
-
-#if defined(OS_WIN)
-  OleUninitialize();
-#endif
 }
 
 TestRenderViewHost* BrowserWithTestWindowTest::TestRenderViewHostForTab(
     WebContents* web_contents) {
   return static_cast<TestRenderViewHost*>(web_contents->GetRenderViewHost());
 }
 
 void BrowserWithTestWindowTest::AddTab(Browser* browser, const GURL& url) {
   browser::NavigateParams params(browser, url, content::PAGE_TRANSITION_TYPED);
   params.tabstrip_index = 0;
@@ skipping 63 matching lines @@
   // Make sure we close all tabs, otherwise Browser isn't happy in its
   // destructor.
   browser()->CloseAllTabs();
   browser_.reset(NULL);
   window_.reset(NULL);
 }
 
 TestingProfile* BrowserWithTestWindowTest::CreateProfile() {
   return new TestingProfile();
 }