We don't need to do both OleInitialize() and CoInitializeEx() on the same thread. Eliminate the Sc…

content/browser/browser_main_runner.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 "content/public/browser/browser_main_runner.h"
 
 #include "base/allocator/allocator_shim.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/statistics_recorder.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/notification_service_impl.h"
 #include "content/common/child_process.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
-#include "base/win/scoped_com_initializer.h"
+#include "ui/base/win/scoped_ole_initializer.h"
 #include "ui/base/win/tsf_bridge.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "content/browser/android/surface_texture_peer_browser_impl.h"
 #endif
 
 bool g_exited_main_message_loop = false;
 
 namespace {
@@ skipping 53 matching lines @@
     // to browser_shutdown::Shutdown or BrowserProcess::EndSession.
 
 #if defined(OS_WIN)
 #if !defined(NO_TCMALLOC)
     // When linking shared libraries, NO_TCMALLOC is defined, and dynamic
     // allocator selection is not supported.
 
     // Make this call before going multithreaded, or spawning any subprocesses.
     base::allocator::SetupSubprocessAllocator();
 #endif
-    com_initializer_.reset(new base::win::ScopedCOMInitializer);
+    ole_initializer_.reset(new ui::ScopedOleInitializer);
     if (base::win::IsTsfAwareRequired())
       ui::TsfBridge::Initialize();
 #endif  // OS_WIN
 
 #if defined(OS_ANDROID)
     content::SurfaceTexturePeer::InitInstance(
         new content::SurfaceTexturePeerBrowserImpl(
             parameters.command_line.HasSwitch(
                 switches::kMediaPlayerInRenderProcess)));
 #endif
@@ skipping 19 matching lines @@
     DCHECK(is_initialized_);
     DCHECK(!is_shutdown_);
     g_exited_main_message_loop = true;
 
     if (created_threads_)
       main_loop_->ShutdownThreadsAndCleanUp();
 
 #if defined(OS_WIN)
     if (base::win::IsTsfAwareRequired())
       ui::TsfBridge::GetInstance()->Shutdown();
-    com_initializer_.reset(NULL);
+    ole_initializer_.reset(NULL);
 #endif
 
     main_loop_.reset(NULL);
 
     notification_service_.reset(NULL);
 
     is_shutdown_ = true;
   }
 
  protected:
   // True if the runner has been initialized.
   bool is_initialized_;
 
   // True if the runner has been shut down.
   bool is_shutdown_;
 
   // True if the non-UI threads were created.
   bool created_threads_;
 
   scoped_ptr<NotificationServiceImpl> notification_service_;
   scoped_ptr<content::BrowserMainLoop> main_loop_;
 #if defined(OS_WIN)
-  scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_;
+  scoped_ptr<ui::ScopedOleInitializer> ole_initializer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainRunnerImpl);
 };
 
 }  // namespace
 
 namespace content {
 
 // static
 BrowserMainRunner* BrowserMainRunner::Create() {
   return new BrowserMainRunnerImpl();
 }
 
 }  // namespace content