net: rename BoundNetLog to NetLogWithSource

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 136 matching lines @@
 
 std::unique_ptr<base::ListValue> ProxyList::ToValue() const {
   std::unique_ptr<base::ListValue> list(new base::ListValue());
   for (size_t i = 0; i < proxies_.size(); ++i)
     list->AppendString(proxies_[i].ToURI());
   return list;
 }
 
 bool ProxyList::Fallback(ProxyRetryInfoMap* proxy_retry_info,
                          int net_error,
-                         const BoundNetLog& net_log) {
+                         const NetLogWithSource& 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
@@ skipping 12 matching lines @@
   // Remove this proxy from our list.
   proxies_.erase(proxies_.begin());
   return !proxies_.empty();
 }
 
 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 {
+                                    const NetLogWithSource& 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) {
     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;
   }
   net_log.AddEvent(NetLogEventType::PROXY_LIST_FALLBACK,
                    NetLog::StringCallback("bad_proxy", &proxy_key));
 }
 
 void ProxyList::UpdateRetryInfoOnFallback(
     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 {
+    const NetLogWithSource& net_log) const {
   DCHECK(!retry_delay.is_zero());
 
   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