diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 19:28:09 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 19:28:09 +0000 |
| commit | ec11be60eaf6e832219328ea18656c558dec3040 (patch) | |
| tree | 1d8a6710f277a55b4743fbc54c8554abf3164669 /net/proxy/single_threaded_proxy_resolver.cc | |
| parent | 9bb75ccc56cdb94a9778dcef26be3de97808f3ce (diff) | |
| download | chromium_src-ec11be60eaf6e832219328ea18656c558dec3040.zip chromium_src-ec11be60eaf6e832219328ea18656c558dec3040.tar.gz chromium_src-ec11be60eaf6e832219328ea18656c558dec3040.tar.bz2 | |
More cleanup to address TODOs in net_log.h.
* Removes 9 methods: AddEventWithParameters, BeginEventWithParameters, EndEventWithParameters, BeginEventWithString, BeginEventWithInteger, AddEventWithString, AddEventWithInteger, EndEventWithParameters, EndEventWithInteger. This was becoming ridiculous, instead made the EventParameters* a required parameter.
* Moves CapturingBoundNetLog / CapturingNetLog to its own file.
BUG=37421
Review URL: http://codereview.chromium.org/1746012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/single_threaded_proxy_resolver.cc')
| -rw-r--r-- | net/proxy/single_threaded_proxy_resolver.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/proxy/single_threaded_proxy_resolver.cc b/net/proxy/single_threaded_proxy_resolver.cc index b0fd4a3..1903820 100644 --- a/net/proxy/single_threaded_proxy_resolver.cc +++ b/net/proxy/single_threaded_proxy_resolver.cc @@ -6,7 +6,7 @@ #include "base/message_loop.h" #include "base/thread.h" -#include "net/base/net_log.h" +#include "net/base/capturing_net_log.h" #include "net/base/net_errors.h" #include "net/proxy/proxy_info.h" @@ -247,7 +247,7 @@ int SingleThreadedProxyResolver::GetProxyForURL(const GURL& url, } else { // Otherwise the job will get started eventually by ProcessPendingJobs(). job->net_log()->BeginEvent( - NetLog::TYPE_WAITING_FOR_SINGLE_PROXY_RESOLVER_THREAD); + NetLog::TYPE_WAITING_FOR_SINGLE_PROXY_RESOLVER_THREAD, NULL); } // Completion will be notified through |callback|, unless the caller cancels @@ -329,7 +329,7 @@ void SingleThreadedProxyResolver::ProcessPendingJobs() { return; job->net_log()->EndEvent( - NetLog::TYPE_WAITING_FOR_SINGLE_PROXY_RESOLVER_THREAD); + NetLog::TYPE_WAITING_FOR_SINGLE_PROXY_RESOLVER_THREAD, NULL); EnsureThreadStarted(); job->Start(); |