Index: net/proxy/proxy_list.h |
diff --git a/net/proxy/proxy_list.h b/net/proxy/proxy_list.h |
index aa477d2083834fd7cf5d1bb3c305c600c5926931..33759ab019f6825fcee6c26e9862ebd64a87443c 100644 |
--- a/net/proxy/proxy_list.h |
+++ b/net/proxy/proxy_list.h |
@@ -79,7 +79,7 @@ class NET_EXPORT_PRIVATE ProxyList { |
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 i
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| |
@@ -87,7 +87,7 @@ class NET_EXPORT_PRIVATE ProxyList { |
// 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-styl
msu.koo
2015/08/24 12:07:18
I think it's better just to use raw pointers in he
|
int net_error, |
const BoundNetLog& net_log); |
@@ -101,7 +101,7 @@ class NET_EXPORT_PRIVATE ProxyList { |
// 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, |
@@ -114,7 +114,7 @@ class NET_EXPORT_PRIVATE ProxyList { |
// |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, |