Second attempt at trying to land buggy bho avoidance: http://codereview.chrom...

chrome_frame/bind_context_info.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_frame/bind_context_info.h"
 #include "chrome_frame/utils.h"
 
 // This is non const due to API expectations
 static wchar_t* kBindContextInfo = L"_CHROMEFRAME_BIND_CONTEXT_INFO_";
 
@@ skipping 29 matching lines @@
   }
 
   ScopedComPtr<IUnknown> context;
   HRESULT hr = bind_context->GetObjectParam(kBindContextInfo,
                                             context.Receive());
   if (context) {
     ScopedComPtr<IBindContextInfoInternal> internal;
     hr = internal.QueryFrom(context);
     DCHECK(SUCCEEDED(hr));
     if (SUCCEEDED(hr)) {
-      BindContextInfo* ret = NULL;
       hr = internal->GetCppObject(reinterpret_cast<void**>(info));
       DCHECK_EQ(hr, S_OK);
+      DLOG_IF(ERROR, *info != static_cast<BindContextInfo*>(internal.get()))
+          << "marshalling took place!";
     }
   } else {
     DCHECK(FAILED(hr));
     CComObject<BindContextInfo>* bind_context_info = NULL;
     hr = CComObject<BindContextInfo>::CreateInstance(&bind_context_info);
     DCHECK(bind_context_info != NULL);
     if (bind_context_info) {
       bind_context_info->AddRef();
       hr = bind_context_info->Initialize(bind_context);
       if (FAILED(hr)) {
         bind_context_info->Release();
       } else {
         *info = bind_context_info;
       }
     }
   }
 
   return hr;
 }
 
 void BindContextInfo::SetToSwitch(IStream* cache) {
   is_switching_ = true;
   if  (!no_cache_) {
     cache_ = cache;
     RewindStream(cache_);
   }
 }