ChromeFrame HTTP requests would randomly fail if we navigated to multiple HTT...

chrome_frame/chrome_frame_activex_base.h

 // 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.
 
 #ifndef CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_
 #define CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlctl.h>
@@ skipping 132 matching lines @@
   public ISupportErrorInfo,
   public IQuickActivateImpl<T>,
   public com_util::IProvideClassInfo2Impl<class_id,
                                           DIID_DIChromeFrameEvents>,
   public com_util::IDispatchImpl<IChromeFrame>,
   public IConnectionPointContainerImpl<T>,
   public ProxyDIChromeFrameEvents<T>,
   public IPropertyNotifySinkCP<T>,
   public CComCoClass<T, &class_id>,
   public CComControl<T>,
-  public ChromeFramePlugin<T>,
-  public TaskMarshallerThroughWindowsMessages<
-            ChromeFrameActivexBase<T, class_id> > {
+  public ChromeFramePlugin<T> {
  protected:
   typedef std::set<ScopedComPtr<IDispatch> > EventHandlers;
-  typedef TaskMarshallerThroughWindowsMessages<
-      ChromeFrameActivexBase<T, class_id> > TaskMarshaller;
   typedef ChromeFrameActivexBase<T, class_id> Base;
 
  public:
   ChromeFrameActivexBase()
       : ready_state_(READYSTATE_UNINITIALIZED),
         worker_thread_("ChromeFrameWorker_Thread") {
     m_bWindowOnly = TRUE;
   }
 
   ~ChromeFrameActivexBase() {
@@ skipping 27 matching lines @@
 BEGIN_CONNECTION_POINT_MAP(T)
   CONNECTION_POINT_ENTRY(IID_IPropertyNotifySink)
   CONNECTION_POINT_ENTRY(DIID_DIChromeFrameEvents)
 END_CONNECTION_POINT_MAP()
 
 BEGIN_MSG_MAP(ChromeFrameActivexBase)
   MESSAGE_HANDLER(WM_CREATE, OnCreate)
   MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
   CHAIN_MSG_MAP(ChromeFramePlugin<T>)
   CHAIN_MSG_MAP(CComControl<T>)
-  CHAIN_MSG_MAP(TaskMarshaller)
   DEFAULT_REFLECTION_HANDLER()
 END_MSG_MAP()
 
   // IViewObjectEx
   DECLARE_VIEW_STATUS(VIEWSTATUS_SOLIDBKGND | VIEWSTATUS_OPAQUE)
 
   inline HRESULT IViewObject_Draw(DWORD draw_aspect, LONG index,
       void* aspect_info, DVTARGETDEVICE* ptd, HDC info_dc, HDC dc,
       LPCRECTL bounds, LPCRECTL win_bounds) {
     // ATL ASSERTs if dwDrawAspect is DVASPECT_DOCPRINT, so we cheat.
@@ skipping 223 matching lines @@
     }
 
     DCHECK(request.get() != NULL);
 
     if (request->Initialize(
         automation_client_.get(), tab_handle, request_id, request_info.url,
         request_info.method, request_info.referrer,
         request_info.extra_request_headers, request_info.upload_data.get(),
         static_cast<T*>(this)->is_frame_busting_enabled())) {
       request->set_worker_thread(&worker_thread_);
-      request->set_task_marshaller(this);
       // If Start is successful, it will add a self reference.
       request->Start();
       request->set_parent_window(m_hWnd);
     }
   }
 
   virtual void OnRequestRead(int tab_handle, int request_id,
                              int bytes_to_read) {
     automation_client_->ReadRequest(request_id, bytes_to_read);
   }
@@ skipping 550 matching lines @@
   EventHandlers onprivatemessage_;
   EventHandlers onextensionready_;
 
   // The UrlmonUrlRequest instance instantiated for downloading the base URL.
   scoped_refptr<CComObject<UrlmonUrlRequest> > base_url_request_;
 
   base::Thread worker_thread_;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_ACTIVEX_BASE_H_