| Index: net/proxy/proxy_service.cc
|
| diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
|
| index fe34f7b492865f05c082d94224abc9b94623a52b..c54ce7570164c05491f35d162d94843d6bd6c01d 100644
|
| --- a/net/proxy/proxy_service.cc
|
| +++ b/net/proxy/proxy_service.cc
|
| @@ -306,7 +306,7 @@ class ProxyResolverFactoryForPacResult : public ProxyResolverFactory {
|
| base::Value* NetLogProxyConfigChangedCallback(
|
| const ProxyConfig* old_config,
|
| const ProxyConfig* new_config,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| // The "old_config" is optional -- the first notification will not have
|
| // any "previous" configuration.
|
| @@ -317,7 +317,7 @@ base::Value* NetLogProxyConfigChangedCallback(
|
| }
|
|
|
| base::Value* NetLogBadProxyListCallback(const ProxyRetryInfoMap* retry_info,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| base::ListValue* list = new base::ListValue();
|
|
|
| @@ -332,7 +332,7 @@ base::Value* NetLogBadProxyListCallback(const ProxyRetryInfoMap* retry_info,
|
| // Returns NetLog parameters on a successfuly proxy resolution.
|
| base::Value* NetLogFinishedResolvingProxyCallback(
|
| const ProxyInfo* result,
|
| - NetLog::LogLevel /* log_level */) {
|
| + NetLogCaptureMode /* capture_mode */) {
|
| base::DictionaryValue* dict = new base::DictionaryValue();
|
| dict->SetString("pac_string", result->ToPacString());
|
| return dict;
|
| @@ -1384,7 +1384,7 @@ int ProxyService::DidFinishResolvingProxy(const GURL& url,
|
| network_delegate->NotifyResolveProxy(url, load_flags, *this, result);
|
|
|
| // When logging all events is enabled, dump the proxy list.
|
| - if (net_log.IsLogging()) {
|
| + if (net_log.GetCaptureMode().enabled()) {
|
| net_log.AddEvent(
|
| NetLog::TYPE_PROXY_SERVICE_RESOLVED_PROXY_LIST,
|
| base::Bind(&NetLogFinishedResolvingProxyCallback, result));
|
|
|