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

chrome_frame/urlmon_url_request.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_URLMON_URL_REQUEST_H_
 #define CHROME_FRAME_URLMON_URL_REQUEST_H_
 
 #include <urlmon.h>
 #include <atlbase.h>
 #include <atlcom.h>
+#include <atlwin.h>
 
 #include <algorithm>
 
 #include "base/lock.h"
 #include "base/platform_thread.h"
 #include "base/thread.h"
 #include "base/scoped_comptr_win.h"
 #include "chrome_frame/plugin_url_request.h"
 #include "chrome_frame/chrome_frame_delegate.h"
 
 #include "net/base/net_errors.h"
 #include "net/base/upload_data.h"
 
 class UrlmonUrlRequest
     : public CComObjectRootEx<CComSingleThreadModel>,
       public PluginUrlRequest,
       public IServiceProviderImpl<UrlmonUrlRequest>,
       public IBindStatusCallback,
       public IHttpNegotiate,
       public IAuthenticate,
-      public IHttpSecurity {
+      public IHttpSecurity,
+      public CWindowImpl<UrlmonUrlRequest>,
+      public TaskMarshallerThroughWindowsMessages<UrlmonUrlRequest> {
  public:
+  typedef TaskMarshallerThroughWindowsMessages<UrlmonUrlRequest>
+      TaskMarshaller;
+
   UrlmonUrlRequest();
   ~UrlmonUrlRequest();
 
 BEGIN_COM_MAP(UrlmonUrlRequest)
   COM_INTERFACE_ENTRY(IHttpNegotiate)
   COM_INTERFACE_ENTRY(IServiceProvider)
   COM_INTERFACE_ENTRY(IBindStatusCallback)
   COM_INTERFACE_ENTRY(IWindowForBindingUI)
   COM_INTERFACE_ENTRY(IAuthenticate)
   COM_INTERFACE_ENTRY(IHttpSecurity)
 END_COM_MAP()
 
 BEGIN_SERVICE_MAP(UrlmonUrlRequest)
   SERVICE_ENTRY(IID_IHttpNegotiate);
 END_SERVICE_MAP()
 
+BEGIN_MSG_MAP(UrlmonUrlRequest)
+  CHAIN_MSG_MAP(TaskMarshaller)
+END_MSG_MAP()
+
   // PluginUrlRequest implementation
   virtual bool Start();
   virtual void Stop();
   virtual bool Read(int bytes_to_read);
 
   // IBindStatusCallback implementation
   STDMETHOD(OnStartBinding)(DWORD reserved, IBinding* binding);
   STDMETHOD(GetPriority)(LONG* priority);
   STDMETHOD(OnLowResource)(DWORD reserved);
   STDMETHOD(OnProgress)(ULONG progress, ULONG max_progress,
@@ skipping 33 matching lines @@
   // Needed to support PostTask.
   static bool ImplementsThreadSafeReferenceCounting() {
     return true;
   }
 
   // URL requests are handled on this thread.
   void set_worker_thread(base::Thread* worker_thread) {
     worker_thread_ = worker_thread;
   }
 
-  void set_task_marshaller(TaskMarshaller* task_marshaller) {
-    task_marshaller_ = task_marshaller;
-  }
+  virtual void OnFinalMessage(HWND window);
 
  protected:
   // The following functions issue and handle Urlmon requests on the dedicated
   // Urlmon thread.
   void StartAsync();
   void StopAsync();
   void ReadAsync(int bytes_to_read);
 
   static const size_t kCopyChunkSize = 32 * 1024;
   // URL requests are handled on this thread.
   base::Thread* worker_thread_;
 
-  TaskMarshaller* task_marshaller_;
-
   // A fake stream class to make it easier to copy received data using
   // IStream::CopyTo instead of allocating temporary buffers and keeping
   // track of data copied so far.
   class SendStream
       : public CComObjectRoot,
         public IStream {
    public:
     SendStream() {
     }
 
@@ skipping 118 matching lines @@
   URLRequestStatus status_;
 
   PlatformThreadId thread_;
   static int instance_count_;
   HWND parent_window_;
   DISALLOW_COPY_AND_ASSIGN(UrlmonUrlRequest);
 };
 
 #endif  // CHROME_FRAME_URLMON_URL_REQUEST_H_