Merge 68042 - We need to pin Chrome Frame so that it doesn't get stuck on rel...

ceee/ie/broker/chrome_postman.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.
 //
 // ChromePostman implementation.
 #include "ceee/ie/broker/chrome_postman.h"
 
 #include "base/string_util.h"
 #include "ceee/ie/broker/api_dispatcher.h"
 #include "ceee/ie/common/api_registration.h"
@@ skipping 226 matching lines @@
   DCHECK(ChromePostman::GetInstance() != NULL);
   chrome_frame_host_->SetEventSink(ChromePostman::GetInstance());
   chrome_frame_host_->SetChromeProfileName(
       ceee_module_util::GetBrokerProfileNameForIe());
   hr = chrome_frame_host_->StartChromeFrame();
   DCHECK(SUCCEEDED(hr));
   if (FAILED(hr)) {
     LOG(ERROR) << "Failed to start chrome frame " << com::LogHr(hr);
     return hr;
   }
+  // We need to pin the Chrome Frame DLL so that it doesn't get unloaded
+  // while we call CoUninitialize in our thread cleanup, otherwise we would
+  // get stuck on breakpad termination as filed in http://crbug.com/64388.
+  static bool s_pinned = false;
+  if (!s_pinned) {
+    HMODULE unused;
+    if (!GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_PIN, L"npchrome_frame.dll",
+                           &unused)) {
+      NOTREACHED() << "Failed to pin Chrome Frame. " << com::LogWe();
+    } else {
+      s_pinned = true;
+    }
+  }
   return hr;
 }
 
 HRESULT ChromePostman::ChromePostmanThread::CreateChromeFrameHost() {
   DCHECK(thread_id() == ::GetCurrentThreadId());
   return ChromeFrameHost::CreateInitializedIID(IID_IChromeFrameHost,
                                                &chrome_frame_host_);
 }
 
 void ChromePostman::ChromePostmanThread::CleanUp() {
@@ skipping 39 matching lines @@
 void ChromePostman::ApiInvocationWorkerThread::Init() {
   ::CoInitializeEx(0, COINIT_MULTITHREADED);
   ProductionApiDispatcher::get()->SetApiInvocationThreadId(
       ::GetCurrentThreadId());
 }
 
 void ChromePostman::ApiInvocationWorkerThread::CleanUp() {
   ::CoUninitialize();
   ProductionApiDispatcher::get()->SetApiInvocationThreadId(0);
 }