Merge 31792 - The ChromeFrameAutomationClient class needs to be refcounted as...

chrome_frame/chrome_frame_activex_base.h

Index: chrome_frame/chrome_frame_activex_base.h
===================================================================
--- chrome_frame/chrome_frame_activex_base.h	(revision 31968)
+++ chrome_frame/chrome_frame_activex_base.h	(working copy)
@@ -134,7 +134,7 @@
 // Common implementation for ActiveX and Active Document
 template <class T, const CLSID& class_id>
 class ATL_NO_VTABLE ChromeFrameActivexBase :
-  public CComObjectRootEx<CComSingleThreadModel>,
+  public CComObjectRootEx<CComMultiThreadModel>,
   public IOleControlImpl<T>,
   public IOleObjectImpl<T>,
   public IOleInPlaceActiveObjectImpl<T>,
@@ -508,7 +508,7 @@
       worker_thread_.message_loop()->PostTask(
           FROM_HERE, NewRunnableMethod(this, &Base::OnWorkerStop));
       if (automation_client_.get())
-        automation_client_->CleanupAsyncRequests();
+        automation_client_->CleanupRequests();
       worker_thread_.Stop();
     }
     return 0;