| Index: chrome/browser/net/passive_log_collector.cc
|
| ===================================================================
|
| --- chrome/browser/net/passive_log_collector.cc (revision 113525)
|
| +++ chrome/browser/net/passive_log_collector.cc (working copy)
|
| @@ -66,8 +66,8 @@
|
| trackers_[net::NetLog::SOURCE_SOCKET_STREAM] = &socket_stream_tracker_;
|
| trackers_[net::NetLog::SOURCE_CONNECT_JOB] = &connect_job_tracker_;
|
| trackers_[net::NetLog::SOURCE_SOCKET] = &socket_tracker_;
|
| - trackers_[net::NetLog::SOURCE_INIT_PROXY_RESOLVER] =
|
| - &init_proxy_resolver_tracker_;
|
| + trackers_[net::NetLog::SOURCE_PROXY_SCRIPT_DECIDER] =
|
| + &proxy_script_decider_tracker_;
|
| trackers_[net::NetLog::SOURCE_SPDY_SESSION] = &spdy_session_tracker_;
|
| trackers_[net::NetLog::SOURCE_HOST_RESOLVER_IMPL_REQUEST] =
|
| &dns_request_tracker_;
|
| @@ -488,22 +488,23 @@
|
| }
|
|
|
| //----------------------------------------------------------------------------
|
| -// InitProxyResolverTracker
|
| +// ProxyScriptDeciderTracker
|
| //----------------------------------------------------------------------------
|
|
|
| -const size_t PassiveLogCollector::InitProxyResolverTracker::kMaxNumSources = 20;
|
| -const size_t PassiveLogCollector::InitProxyResolverTracker::kMaxGraveyardSize =
|
| - 3;
|
| +const size_t PassiveLogCollector::ProxyScriptDeciderTracker::kMaxNumSources
|
| + = 20;
|
| +const size_t PassiveLogCollector::ProxyScriptDeciderTracker::kMaxGraveyardSize
|
| + = 3;
|
|
|
| -PassiveLogCollector::InitProxyResolverTracker::InitProxyResolverTracker()
|
| +PassiveLogCollector::ProxyScriptDeciderTracker::ProxyScriptDeciderTracker()
|
| : SourceTracker(kMaxNumSources, kMaxGraveyardSize, NULL) {
|
| }
|
|
|
| PassiveLogCollector::SourceTracker::Action
|
| -PassiveLogCollector::InitProxyResolverTracker::DoAddEntry(
|
| +PassiveLogCollector::ProxyScriptDeciderTracker::DoAddEntry(
|
| const ChromeNetLog::Entry& entry, SourceInfo* out_info) {
|
| AddEntryToSourceInfo(entry, out_info);
|
| - if (entry.type == net::NetLog::TYPE_INIT_PROXY_RESOLVER &&
|
| + if (entry.type == net::NetLog::TYPE_PROXY_SCRIPT_DECIDER &&
|
| entry.phase == net::NetLog::PHASE_END) {
|
| return ACTION_MOVE_TO_GRAVEYARD;
|
| }
|
|
|