BrowserMain() refactoring, part 2.

chrome/browser/browser_main_win.cc

 // Copyright (c) 2010 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/browser/browser_main.h"
 #include "chrome/browser/browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
@@ skipping 15 matching lines @@
 #include "chrome/common/result_codes.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/winsock_init.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/window/window.h"
 
-void WillInitializeMainMessageLoop(const MainFunctionParams& parameters) {
-  OleInitialize(NULL);
-}
-
 void DidEndMainMessageLoop() {
   OleUninitialize();
 }
 
 void RecordBreakpadStatusUMA(MetricsService* metrics) {
   DWORD len = ::GetEnvironmentVariableW(
       ASCIIToWide(env_vars::kNoOOBreakpad).c_str() , NULL, 0);
   metrics->RecordBreakpadRegistration((len == 0));
   metrics->RecordBreakpadHasDebugger(TRUE == ::IsDebuggerPresent());
 }
@@ skipping 154 matching lines @@
   return false;
 }
 
 // BrowserMainPartsWin ---------------------------------------------------------
 
 class BrowserMainPartsWin : public BrowserMainParts {
  public:
   explicit BrowserMainPartsWin(const MainFunctionParams& parameters)
       : BrowserMainParts(parameters) {}
 
- private:
+ protected:
   virtual void PreEarlyInitialization() {
     // Initialize Winsock.
     net::EnsureWinsockInit();
   }
+
+  virtual void PreMainMessageLoopStart() {
+    OleInitialize(NULL);
+  }
 };
 
 // static
 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts(
     const MainFunctionParams& parameters) {
   return new BrowserMainPartsWin(parameters);
 }