Get rid of content::DidEndMainMessageLoop since it was declared in content but defined in chrome,...

content/browser/browser_main.cc

 // Copyright (c) 2011 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/browser/browser_main.h"
 
 #include "base/allocator/allocator_shim.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 146 matching lines @@
 #endif
 
 }  // namespace
 
 namespace content {
 
 BrowserMainParts::BrowserMainParts(const MainFunctionParams& parameters)
     : parameters_(parameters),
       parsed_command_line_(parameters.command_line_),
       result_code_(content::RESULT_CODE_NORMAL_EXIT) {
+#if defined(OS_WIN)
+  OleInitialize(NULL);
+#endif
 }
 
 BrowserMainParts::~BrowserMainParts() {
+#if defined(OS_WIN)
+  OleUninitialize();
+#endif
 }
 
 void BrowserMainParts::EarlyInitialization() {
   PreEarlyInitialization();
 
 #if defined(OS_WIN)
   net::EnsureWinsockInit();
 #endif
 
   // Use NSS for SSL by default.
@@ skipping 32 matching lines @@
   if (parsed_command_line().HasSwitch(switches::kEnableTcpFastOpen))
     net::set_tcp_fastopen_enabled(true);
 
   PostEarlyInitialization();
 }
 
 void BrowserMainParts::MainMessageLoopStart() {
   PreMainMessageLoopStart();
 
 #if defined(OS_WIN)
-  OleInitialize(NULL);
-
   // If we're running tests (ui_task is non-null), then the ResourceBundle
   // has already been initialized.
   if (!parameters().ui_task) {
     // Override the configured locale with the user's preferred UI language.
     l10n_util::OverrideLocaleWithUILanguageList();
   }
 #endif
 
   main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
 
@@ skipping 175 matching lines @@
   base::win::ScopedCOMInitializer com_initializer;
 #endif  // OS_WIN
 
   base::StatisticsRecorder statistics;
 
   parts->RunMainMessageLoopParts();
 
   TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
   return parts->result_code();
 }