More cleanup of net_log.h

net/proxy/single_threaded_proxy_resolver.cc

 // Copyright (c) 2010 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/single_threaded_proxy_resolver.h"
 
 #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"
 
 namespace net {
 
 namespace {
 
 class PurgeMemoryTask : public base::RefCountedThreadSafe<PurgeMemoryTask> {
  public:
   explicit PurgeMemoryTask(ProxyResolver* resolver) : resolver_(resolver) {}
@@ skipping 220 matching lines @@
   bool is_first_job = pending_jobs_.empty();
   pending_jobs_.push_back(job);  // Jobs can never finish synchronously.
 
   if (is_first_job) {
     // If there is nothing already running, start the job now.
     EnsureThreadStarted();
     job->Start();
   } 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
   // the request using |request|.
   if (request)
     *request = reinterpret_cast<RequestHandle>(job.get());
 
   return ERR_IO_PENDING;
 }
 
@@ skipping 61 matching lines @@
 void SingleThreadedProxyResolver::ProcessPendingJobs() {
   if (pending_jobs_.empty())
     return;
 
   // Get the next job to process (FIFO).
   Job* job = pending_jobs_.front().get();
   if (job->is_started())
     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();
 }
 
 void SingleThreadedProxyResolver::RemoveFrontOfJobsQueueAndStartNext(
     Job* expected_job) {
   DCHECK_EQ(expected_job, pending_jobs_.front().get());
   pending_jobs_.pop_front();
 
   // Start next work item.
   ProcessPendingJobs();
 }
 
 void SingleThreadedProxyResolver::RemoveOutstandingSetPacScriptTask(
     SetPacScriptTask* task) {
   DCHECK_EQ(outstanding_set_pac_script_task_.get(), task);
   outstanding_set_pac_script_task_ = NULL;
 }
 
 }  // namespace net