summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_service.cc
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-27 23:20:45 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-27 23:20:45 +0000
commitd13f51bc832e8e7965e92f5aa4b16b8c10c3f913 (patch)
treed5a1a413bf8716befbae7d056cd8c6194eed5a98 /net/proxy/proxy_service.cc
parentf2286c23e17c0012d53800a5ef28975b6e22393a (diff)
downloadchromium_src-d13f51bc832e8e7965e92f5aa4b16b8c10c3f913.zip
chromium_src-d13f51bc832e8e7965e92f5aa4b16b8c10c3f913.tar.gz
chromium_src-d13f51bc832e8e7965e92f5aa4b16b8c10c3f913.tar.bz2
Cleanup: Address some of the todos in net_log.h
- Get rid of the AddString() and AddStringLiteral() methods. - Make EventParameters able to serialize to JSON, instead of a string. BUG=37421 Review URL: http://codereview.chromium.org/1716007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.cc')
-rw-r--r--net/proxy/proxy_service.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index e3778b9..588b240 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -469,14 +469,15 @@ int ProxyService::DidFinishResolvingProxy(ProxyInfo* result,
if (result_code == OK) {
// When full logging is enabled, dump the proxy list.
if (net_log.HasListener()) {
- net_log.AddString(
- std::string("Resolved proxy list: ") + result->ToPacString());
+ net_log.AddEventWithString(
+ NetLog::TYPE_PROXY_SERVICE_RESOLVED_PROXY_LIST,
+ "pac_string", result->ToPacString());
}
result->DeprioritizeBadProxies(proxy_retry_info_);
} else {
- net_log.AddString(StringPrintf(
- "Got an error from proxy resolver (%d), falling-back to DIRECT.",
- result_code));
+ net_log.AddEventWithInteger(
+ NetLog::TYPE_PROXY_SERVICE_RESOLVED_PROXY_LIST,
+ "net_error", result_code);
// Fall-back to direct when the proxy resolver fails. This corresponds
// with a javascript runtime error in the PAC script.