Refactored not to expose raw pointers on ProxyList class.

net/proxy/proxy_list.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 "net/proxy/proxy_list.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/time/time.h"
@@ skipping 124 matching lines @@
   std::string proxy_list;
   std::vector<ProxyServer>::const_iterator iter = proxies_.begin();
   for (; iter != proxies_.end(); ++iter) {
     if (!proxy_list.empty())
       proxy_list += ";";
     proxy_list += iter->ToPacString();
   }
   return proxy_list.empty() ? std::string() : proxy_list;
 }
 
-base::ListValue* ProxyList::ToValue() const {
+scoped_ptr<base::ListValue> ProxyList::ToValue() const {
   scoped_ptr<base::ListValue> list(new base::ListValue());
   for (size_t i = 0; i < proxies_.size(); ++i)
     list->AppendString(proxies_[i].ToURI());
-  return list.release();
+  return list.Pass();
 }
 
-bool ProxyList::Fallback(ProxyRetryInfoMap* proxy_retry_info,
+bool ProxyList::Fallback(ProxyRetryInfoMap& proxy_retry_info,
                          int net_error,
                          const BoundNetLog& net_log) {
-
   // TODO(eroman): It would be good if instead of removing failed proxies
   // from the list, we simply annotated them with the error code they failed
   // with. Of course, ProxyService::ReconsiderProxyAfterError() would need to
   // be given this information by the network transaction.
   //
   // The advantage of this approach is when the network transaction
   // fails, we could output the full list of proxies that were attempted, and
   // why each one of those failed (as opposed to just the last failure).
   //
   // And also, before failing the transaction wholesale, we could go back and
   // retry the "bad proxies" which we never tried to begin with.
   // (RemoveBadProxies would annotate them as 'expected bad' rather then delete
   // them from the list, so we would know what they were).
 
   if (proxies_.empty()) {
     NOTREACHED();
     return false;
   }
   // By default, proxies are not retried for 5 minutes.
   UpdateRetryInfoOnFallback(proxy_retry_info, TimeDelta::FromMinutes(5), true,
                             std::vector<ProxyServer>(), net_error, net_log);
 
   // Remove this proxy from our list.
   proxies_.erase(proxies_.begin());
   return !proxies_.empty();
 }
 
-void ProxyList::AddProxyToRetryList(ProxyRetryInfoMap* proxy_retry_info,
+void ProxyList::AddProxyToRetryList(ProxyRetryInfoMap& proxy_retry_info,
                                     base::TimeDelta retry_delay,
                                     bool try_while_bad,
                                     const ProxyServer& proxy_to_retry,
                                     int net_error,
                                     const BoundNetLog& net_log) const {
   // Mark this proxy as bad.
   TimeTicks bad_until = TimeTicks::Now() + retry_delay;
   std::string proxy_key = proxy_to_retry.ToURI();
-  ProxyRetryInfoMap::iterator iter = proxy_retry_info->find(proxy_key);
-  if (iter == proxy_retry_info->end() || bad_until > iter->second.bad_until) {
+  ProxyRetryInfoMap::iterator iter = proxy_retry_info.find(proxy_key);
+  if (iter == proxy_retry_info.end() || bad_until > iter->second.bad_until) {
     ProxyRetryInfo retry_info;
     retry_info.current_delay = retry_delay;
     retry_info.bad_until = bad_until;
     retry_info.try_while_bad = try_while_bad;
     retry_info.net_error = net_error;
-    (*proxy_retry_info)[proxy_key] = retry_info;
+    proxy_retry_info[proxy_key] = retry_info;
   }
   net_log.AddEvent(NetLog::TYPE_PROXY_LIST_FALLBACK,
                    NetLog::StringCallback("bad_proxy", &proxy_key));
 }
 
 void ProxyList::UpdateRetryInfoOnFallback(
-    ProxyRetryInfoMap* proxy_retry_info,
+    ProxyRetryInfoMap& proxy_retry_info,
     base::TimeDelta retry_delay,
     bool reconsider,
     const std::vector<ProxyServer>& additional_proxies_to_bypass,
     int net_error,
     const BoundNetLog& net_log) const {
   DCHECK(retry_delay != base::TimeDelta());
 
   if (proxies_.empty()) {
     NOTREACHED();
     return;
   }
 
   if (!proxies_[0].is_direct()) {
     AddProxyToRetryList(proxy_retry_info,
                         retry_delay,
                         reconsider,
                         proxies_[0],
                         net_error,
                         net_log);
     // If any additional proxies to bypass are specified, add to the retry map
     // as well.
     for (const ProxyServer& additional_proxy : additional_proxies_to_bypass) {
       AddProxyToRetryList(proxy_retry_info, retry_delay, reconsider,
                           additional_proxy, net_error, net_log);
     }
   }
 }
 
 }  // namespace net