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

chrome_frame/np_proxy_service.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_NP_PROXY_SERVICE_H_
 #define CHROME_FRAME_NP_PROXY_SERVICE_H_
 
 #include <string>
 #include <vector>
 #include "base/values.h"
@@ skipping 84 matching lines @@
   bool InitializePrefBranch(nsIPrefService* pref_service);
   bool ReadProxySettings(nsIPrefBranch* pref_branch);
 
   std::string GetStringPref(nsIPrefBranch* pref_branch, const char* pref_name);
   int GetIntPref(nsIPrefBranch* pref_branch, const char* pref_name);
   bool GetBoolPref(nsIPrefBranch* pref_branch, const char* pref_name);
 
   void Reset();
   DictionaryValue* BuildProxyValueSet();
 
-  ChromeFrameAutomationClient* automation_client_;
+  scoped_refptr<ChromeFrameAutomationClient> automation_client_;
 
   ScopedNsPtr<nsIServiceManager> service_manager_;
   ScopedNsPtr<nsIPrefService> pref_service_;
   ScopedNsPtr<nsIPrefBranch2> observer_pref_branch_;
 
   struct ProxyNames {
     // Proxy type (http, https, ftp, etc...).
     const char* chrome_scheme;
     // Firefox preference name of the URL for this proxy type.
     const char* pref_name;
@@ skipping 12 matching lines @@
   bool system_config_;
   bool auto_detect_;
   bool no_proxy_;
   int type_;
   std::string pac_url_;
   std::string proxy_bypass_list_;
   ManualProxyList manual_proxies_;
 };
 
 #endif  // CHROME_FRAME_NP_PROXY_SERVICE_H_