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

chrome_frame/chrome_frame_plugin.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_PLUGIN_H_
 #define CHROME_FRAME_CHROME_FRAME_PLUGIN_H_
 
+#include "base/ref_counted.h"
 #include "base/win_util.h"
 #include "chrome_frame/chrome_frame_automation.h"
 #include "chrome_frame/utils.h"
 
 #define IDC_ABOUT_CHROME_FRAME 40018
 
 // A class to implement common functionality for all types of
 // plugins: NPAPI. ActiveX and ActiveDoc
 template <typename T>
 class ChromeFramePlugin : public ChromeFrameDelegateImpl {
  public:
   ChromeFramePlugin()
       : ignore_setfocus_(false),
         is_privileged_(false) {
   }
   ~ChromeFramePlugin() {
     Uninitialize();
   }
 
 BEGIN_MSG_MAP(ChromeFrameActivex)
   MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus)
   MESSAGE_HANDLER(WM_SIZE, OnSize)
   MESSAGE_HANDLER(WM_PARENTNOTIFY, OnParentNotify)
 END_MSG_MAP()
 
   bool Initialize() {
     DCHECK(!automation_client_.get());
-    automation_client_.reset(CreateAutomationClient());
+    automation_client_ = CreateAutomationClient();
     if (!automation_client_.get()) {
       NOTREACHED() << "new ChromeFrameAutomationClient";
       return false;
     }
 
     return true;
   }
 
   void Uninitialize() {
     if (automation_client_.get()) {
       automation_client_->Uninitialize();
-      automation_client_.reset();
+      automation_client_ = NULL;
     }
   }
 
   bool InitializeAutomation(const std::wstring& profile_name,
                             const std::wstring& extra_chrome_arguments,
                             bool incognito) {
     // We don't want to do incognito when privileged, since we're
     // running in browser chrome or some other privileged context.
     bool incognito_mode = !is_privileged_ && incognito;
     return automation_client_->Initialize(this, kCommandExecutionTimeout, true,
@@ skipping 126 matching lines @@
     return false;
   }
 
   // Allow overriding the type of automation client used, for unit tests.
   virtual ChromeFrameAutomationClient* CreateAutomationClient() {
     return new ChromeFrameAutomationClient;
   }
 
  protected:
   // Our gateway to chrome land
-  scoped_ptr<ChromeFrameAutomationClient> automation_client_;
+  scoped_refptr<ChromeFrameAutomationClient> automation_client_;
 
   // Url of the containing document.
   std::string document_url_;
 
   // We set this flag when we're taking the focus ourselves
   // and notifying the host browser that we're doing so.
   // When the flag is not set, we transfer the focus to chrome.
   bool ignore_setfocus_;
 
   // The plugin is privileged if it is:
   // * Invoked by a window running under the system principal in FireFox.
   // * Being hosted by a custom host exposing the SID_ChromeFramePrivileged
   //   service.
   //
   // When privileged, additional interfaces are made available to the user.
   bool is_privileged_;
 
   // List of functions to enable for automation, or a single entry "*" to
   // enable all functions for automation.  Ignored unless is_privileged_ is
   // true.  Defaults to the empty list, meaning automation will not be
   // turned on.
   std::vector<std::string> functions_enabled_;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_PLUGIN_H_