Speculative fix for a chrome browser crash which occurs with ChromeFrame. Bas...

chrome/browser/browser_main_win.cc

 // Copyright (c) 2009 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 13 matching lines @@
 #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 "views/focus/accelerator_handler.h"
 #include "views/window/window.h"
 
 namespace Platform {
 
 void WillInitializeMainMessageLoop(const MainFunctionParams& parameters) {
+  OleInitialize(NULL);
 }
 
 void DidEndMainMessageLoop() {
+  OleUninitialize();
 }
 
 void RecordBreakpadStatusUMA(MetricsService* metrics) {
   DWORD len = ::GetEnvironmentVariableW(env_vars::kNoOOBreakpad, NULL, 0);
   metrics->RecordBreakpadRegistration((len == 0));
   metrics->RecordBreakpadHasDebugger(TRUE == ::IsDebuggerPresent());
 }
 
 }  // namespace Platform
 
@@ skipping 155 matching lines @@
 bool DoUpgradeTasks(const CommandLine& command_line) {
   if (!Upgrade::SwapNewChromeExeIfPresent())
     return false;
   // At this point the chrome.exe has been swapped with the new one.
   if (!Upgrade::RelaunchChromeBrowser(command_line)) {
     // The re-launch fails. Feel free to panic now.
     NOTREACHED();
   }
   return true;
 }