Attempts to get the chrome_frame_tests going again on the chrome frame builde...

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 183 matching lines @@
   COM_INTERFACE_ENTRY_FUNC_BLIND(0, InterfaceNotSupported)
 END_COM_MAP()
 
 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,
@@ skipping 17 matching lines @@
     // Set to true if this is the first launch by this process.
     // Used to perform one time tasks.
     if (g_first_launch_by_process_) {
       g_first_launch_by_process_ = false;
       UMA_HISTOGRAM_CUSTOM_COUNTS("ChromeFrame.IEVersion",
                                   GetIEVersion(),
                                   IE_INVALID,
                                   IE_8,
                                   IE_8 + 1);
     }
-
-    base::Thread::Options options;
-    options.message_loop_type = MessageLoop::TYPE_UI;
-    worker_thread_.StartWithOptions(options);
-    worker_thread_.message_loop()->PostTask(
-        FROM_HERE, NewRunnableMethod(this, &Base::OnWorkerStart));
     return S_OK;
   }
 
   void FinalRelease() {
   }
 
   static HRESULT WINAPI InterfaceNotSupported(void* pv, REFIID riid, void** ppv,
                                               DWORD dw) {
 #ifndef NDEBUG
     wchar_t buffer[64] = {0};
@@ skipping 60 matching lines @@
   // scriptable document, return true, else false.
   bool is_frame_busting_enabled() const {
     return true;
   }
 
   // Needed to support PostTask.
   static bool ImplementsThreadSafeReferenceCounting() {
     return true;
   }
 
-  virtual void OnFinalMessage(HWND) {
-    ChromeFramePlugin<T>::Uninitialize();
-    worker_thread_.message_loop()->PostTask(
-        FROM_HERE, NewRunnableMethod(this, &Base::OnWorkerStop));
-    worker_thread_.Stop();
-  }
-
  protected:
   virtual void OnTabbedOut(int tab_handle, bool reverse) {
     DCHECK(m_bInPlaceActive);
 
     HWND parent = ::GetParent(m_hWnd);
     ::SetFocus(parent);
     ScopedComPtr<IOleControlSite> control_site;
     control_site.QueryFrom(m_spClientSite);
     if (control_site)
       control_site->OnFocus(FALSE);
@@ skipping 81 matching lines @@
       http_headers.Set(referrer_header.c_str());
     }
 
     web_browser2->Navigate2(url.AsInput(), &flags, &empty, &empty,
                             http_headers.AsInput());
     web_browser2->put_Visible(VARIANT_TRUE);
   }
 
   virtual void OnRequestStart(int tab_handle, int request_id,
                               const IPC::AutomationURLRequest& request_info) {
+    // The worker thread may have been stopped. This could happen if the
+    // ActiveX instance was reused.
+    if (!worker_thread_.message_loop()) {
+      base::Thread::Options options;
+      options.message_loop_type = MessageLoop::TYPE_UI;
+      worker_thread_.StartWithOptions(options);
+      worker_thread_.message_loop()->PostTask(
+          FROM_HERE, NewRunnableMethod(this, &Base::OnWorkerStart));
+    }
+
     scoped_refptr<CComObject<UrlmonUrlRequest> > request;
     if (base_url_request_.get() &&
         GURL(base_url_request_->url()) == GURL(request_info.url)) {
       request.swap(base_url_request_);
     } else {
       CComObject<UrlmonUrlRequest>* new_request = NULL;
       CComObject<UrlmonUrlRequest>::CreateInstance(&new_request);
       request = new_request;
     }
 
@@ skipping 53 matching lines @@
     ModifyStyle(0, WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0);
     automation_client_->SetParentWindow(m_hWnd);
     // Only fire the 'interactive' ready state if we aren't there already.
     if (ready_state_ < READYSTATE_INTERACTIVE) {
       ready_state_ = READYSTATE_INTERACTIVE;
       FireOnChanged(DISPID_READYSTATE);
     }
     return 0;
   }
 
+  LRESULT OnDestroy(UINT message, WPARAM wparam, LPARAM lparam,
+                    BOOL& handled) {  // NO_LINT
+    worker_thread_.message_loop()->PostTask(
+        FROM_HERE, NewRunnableMethod(this, &Base::OnWorkerStop));
+    if (automation_client_.get())
+      automation_client_->CleanupRequests();
+    worker_thread_.Stop();
+    return 0;
+  }
+
   // ChromeFrameDelegate override
   virtual void OnAutomationServerReady() {
     ChromeFramePlugin<T>::OnAutomationServerReady();
 
     ready_state_ = READYSTATE_COMPLETE;
     FireOnChanged(DISPID_READYSTATE);
   }
 
   // ChromeFrameDelegate override
   virtual void OnAutomationServerLaunchFailed(
@@ skipping 479 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_