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

chrome_frame/chrome_active_document.cc

 // 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.
 
 // Implementation of ChromeActiveDocument
 #include "chrome_frame/chrome_active_document.h"
 
 #include <hlink.h>
 #include <htiface.h>
 #include <mshtmcid.h>
@@ skipping 40 matching lines @@
       is_automation_client_reused_(false) {
 }
 
 HRESULT ChromeActiveDocument::FinalConstruct() {
   // If we have a cached ChromeActiveDocument instance in TLS, then grab
   // ownership of the cached document's automation client. This is an
   // optimization to get Chrome active documents to load faster.
   ChromeActiveDocument* cached_document = g_active_doc_cache.Get();
   if (cached_document) {
     DCHECK(automation_client_.get() == NULL);
-    automation_client_.reset(cached_document->automation_client_.release());
+    automation_client_ = cached_document->automation_client_.release();
     DLOG(INFO) << "Reusing automation client instance from "
                << cached_document;
     DCHECK(automation_client_.get() != NULL);
     automation_client_->Reinitialize(this);
     is_automation_client_reused_ = true;
   } else {
     // The FinalConstruct implementation in the ChromeFrameActivexBase class
     // i.e. Base creates an instance of the ChromeFrameAutomationClient class
     // and initializes it, which would spawn a new Chrome process, etc.
     // We don't want to be doing this if we have a cached document, whose
@@ skipping 738 matching lines @@
   ScopedComPtr<IBrowserService> browser_service;
   DoQueryService(SID_SShellBrowser, m_spClientSite, browser_service.Receive());
   if (browser_service) {
     ScopedComPtr<ITravelLog> travel_log;
     browser_service->GetTravelLog(travel_log.Receive());
     if (travel_log) {
       travel_log->Travel(browser_service, offset);
     }
   }
 }