Refactored not to expose raw pointers on ProxyList class.

net/proxy/proxy_list.h

 // 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.
 
 #ifndef NET_PROXY_PROXY_LIST_H_
 #define NET_PROXY_PROXY_LIST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 60 matching lines @@
   //   "DIRECT"
   //   "PROXY foopy1"
   //   "PROXY foopy1; SOCKS4 foopy2:1188"
   // Does a best-effort parse, and silently discards any errors.
   void SetFromPacString(const std::string& pac_string);
 
   // Returns a PAC-style semicolon-separated list of valid proxy servers.
   // For example: "PROXY xxx.xxx.xxx.xxx:xx; SOCKS yyy.yyy.yyy:yy".
   std::string ToPacString() const;
 
   // Returns a serialized value for the list. The caller takes ownership of it.

[eroman, 2015/08/18 01:32:09]

Remove comment about ownership since that is now implied by the API

[msu.koo, 2015/08/24 12:07:17]

Done.

-  base::ListValue* ToValue() const;
+  scoped_ptr<base::ListValue> ToValue() const;
 
   // Marks the current proxy server as bad and deletes it from the list. The
   // list of known bad proxies is given by |proxy_retry_info|. |net_error|
   // should contain the network error encountered when this proxy was tried, if
   // any. If this fallback is not because of a network error, then |OK| should
   // be passed in (eg. for reasons such as local policy). Returns true if there
   // is another server available in the list.
-  bool Fallback(ProxyRetryInfoMap* proxy_retry_info,
+  bool Fallback(ProxyRetryInfoMap& proxy_retry_info,

[eroman, 2015/08/18 01:32:10]

This violates the style guide:
https://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Reference_Ar...

For parameters that are mutated we use pointers

[msu.koo, 2015/08/24 12:07:18]

I think it's better just to use raw pointers in here.

                 int net_error,
                 const BoundNetLog& net_log);
 
   // Updates |proxy_retry_info| to indicate that the first proxy in the list
   // is bad. This is distinct from Fallback(), above, to allow updating proxy
   // retry information without modifying a given transction's proxy list. Will
   // retry after |retry_delay| if positive, and will use the default proxy retry
   // duration otherwise. It may reconsider the proxy beforehand if |reconsider|
   // is true. Additionally updates |proxy_retry_info| with
   // |additional_proxies_to_bypass|. |net_error| should contain the network
   // error countered when this proxy was tried, or OK if the proxy retry info is
   // being updated for a non-network related reason (e.g. local policy).
   void 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;
 
  private:
   // Updates |proxy_retry_info| to indicate that the |proxy_to_retry| in
   // |proxies_| is bad for |retry_delay|, but may be reconsidered earlier if
   // |try_while_bad| is true. |net_error| should contain the network error
   // countered when this proxy was tried, or OK if the proxy retry info is
   // being updated for a non-network related reason (e.g. local policy).
-  void AddProxyToRetryList(ProxyRetryInfoMap* proxy_retry_info,
+  void AddProxyToRetryList(ProxyRetryInfoMap& proxy_retry_info,

[eroman, 2015/08/18 01:32:09]

Same comment as earlier

[msu.koo, 2015/08/24 12:07:17]

ditto

                            base::TimeDelta retry_delay,
                            bool try_while_bad,
                            const ProxyServer& proxy_to_retry,
                            int net_error,
                            const BoundNetLog& net_log) const;
 
   // List of proxies.
   std::vector<ProxyServer> proxies_;
 };
 
 }  // namespace net
 
 #endif  // NET_PROXY_PROXY_LIST_H_