RefCounted types should not have public destructors, net/ redux

net/proxy/proxy_script_decider_unittest.cc

 // Copyright (c) 2012 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.
 
 #include <vector>
 
 #include "base/bind.h"
+#include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/net_log_unittest.h"
 #include "net/base/test_completion_callback.h"
 #include "net/proxy/dhcp_proxy_script_fetcher.h"
 #include "net/proxy/proxy_config.h"
@@ skipping 507 matching lines @@
   // it failed downloading, not that it failed parsing.
   EXPECT_EQ(kFailedDownloading,
       decider.Start(config, base::TimeDelta(), true, callback.callback()));
   EXPECT_EQ(NULL, decider.script_data());
 
   EXPECT_FALSE(decider.effective_config().has_pac_url());
 }
 
 class AsyncFailDhcpFetcher
     : public DhcpProxyScriptFetcher,
-      public base::RefCountedThreadSafe<AsyncFailDhcpFetcher> {
+      public base::SupportsWeakPtr<AsyncFailDhcpFetcher> {
  public:
   AsyncFailDhcpFetcher() {}
+  ~AsyncFailDhcpFetcher() {}
 
   int Fetch(string16* utf16_text, const CompletionCallback& callback) OVERRIDE {
     callback_ = callback;
     MessageLoop::current()->PostTask(
         FROM_HERE,
-        base::Bind(&AsyncFailDhcpFetcher::CallbackWithFailure, this));
+        base::Bind(&AsyncFailDhcpFetcher::CallbackWithFailure, AsWeakPtr()));
     return ERR_IO_PENDING;
   }
 
   void Cancel() OVERRIDE {
     callback_.Reset();
   }
 
   const GURL& GetPacURL() const OVERRIDE {
     return dummy_gurl_;
   }
 
   void CallbackWithFailure() {
     if (!callback_.is_null())
       callback_.Run(ERR_PAC_NOT_IN_DHCP);
   }
 
  private:
-  friend class base::RefCountedThreadSafe<AsyncFailDhcpFetcher>;
-  ~AsyncFailDhcpFetcher() {}
-
   GURL dummy_gurl_;
   CompletionCallback callback_;
 };
 
 TEST(ProxyScriptDeciderTest, DhcpCancelledByDestructor) {
   // This regression test would crash before
   // http://codereview.chromium.org/7044058/
   // Thus, we don't care much about actual results (hence no EXPECT or ASSERT
   // macros below), just that it doesn't crash.
   Rules rules;
   RuleBasedProxyScriptFetcher fetcher(&rules);
 
-  scoped_refptr<AsyncFailDhcpFetcher> dhcp_fetcher(new AsyncFailDhcpFetcher());
+  scoped_ptr<AsyncFailDhcpFetcher> dhcp_fetcher(new AsyncFailDhcpFetcher());
 
   ProxyConfig config;
   config.set_auto_detect(true);
   rules.AddFailDownloadRule("http://wpad/wpad.dat");
 
   TestCompletionCallback callback;
 
   // Scope so ProxyScriptDecider gets destroyed early.
   {
     ProxyScriptDecider decider(&fetcher, dhcp_fetcher.get(), NULL);
     decider.Start(config, base::TimeDelta(), true, callback.callback());
   }
 
   // Run the message loop to let the DHCP fetch complete and post the results
   // back. Before the fix linked to above, this would try to invoke on
   // the callback object provided by ProxyScriptDecider after it was
   // no longer valid.
   MessageLoop::current()->RunAllPending();
 }
 
 }  // namespace
 }  // namespace net