More cleanup of net_log.h

net/url_request/url_request.cc

 // Copyright (c) 2006-2009 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/url_request/url_request.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/singleton.h"
 #include "base/stats_counters.h"
@@ skipping 241 matching lines @@
 void URLRequest::Start() {
   StartJob(GetJobManager()->CreateJob(this));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void URLRequest::StartJob(URLRequestJob* job) {
   DCHECK(!is_pending_);
   DCHECK(!job_);
 
-  net_log_.BeginEventWithString(net::NetLog::TYPE_URL_REQUEST_START,
-                                "url", original_url().possibly_invalid_spec());
+  net_log_.BeginEvent(
+      net::NetLog::TYPE_URL_REQUEST_START,
+      new net::NetLogStringParameter(
+          "url", original_url().possibly_invalid_spec()));
 
   job_ = job;
   job_->SetExtraRequestHeaders(extra_request_headers_);
 
   if (upload_.get())
     job_->SetUpload(upload_.get());
 
   is_pending_ = true;
 
   response_info_.request_time = Time::Now();
@@ skipping 86 matching lines @@
   URLRequestJob* job = GetJobManager()->MaybeInterceptRedirect(this, location);
   if (job) {
     RestartWithJob(job);
   } else if (delegate_) {
     delegate_->OnReceivedRedirect(this, location, defer_redirect);
   }
 }
 
 void URLRequest::ResponseStarted() {
   if (!status_.is_success()) {
-    net_log_.EndEventWithInteger(net::NetLog::TYPE_URL_REQUEST_START,
-                                 "net_error", status_.os_error());
+    net_log_.EndEvent(
+        net::NetLog::TYPE_URL_REQUEST_START,
+        new net::NetLogIntegerParameter("net_error", status_.os_error()));
   } else {
-    net_log_.EndEvent(net::NetLog::TYPE_URL_REQUEST_START);
+    net_log_.EndEvent(net::NetLog::TYPE_URL_REQUEST_START, NULL);
   }
 
   URLRequestJob* job = GetJobManager()->MaybeInterceptResponse(this);
   if (job) {
     RestartWithJob(job);
   } else if (delegate_) {
     delegate_->OnResponseStarted(this);
   }
 }
 
@@ skipping 54 matching lines @@
       "content-type",
       "content-length",
       "origin"
   };
   return net::HttpUtil::StripHeaders(
       headers, kPostHeaders, arraysize(kPostHeaders));
 }
 
 int URLRequest::Redirect(const GURL& location, int http_status_code) {
   if (net_log_.HasListener()) {
-    net_log_.AddEventWithString(net::NetLog::TYPE_URL_REQUEST_REDIRECTED,
-                                "location", location.possibly_invalid_spec());
+    net_log_.AddEvent(
+        net::NetLog::TYPE_URL_REQUEST_REDIRECTED,
+        new net::NetLogStringParameter(
+            "location", location.possibly_invalid_spec()));
   }
   if (redirect_limit_ <= 0) {
     DLOG(INFO) << "disallowing redirect: exceeds limit";
     return net::ERR_TOO_MANY_REDIRECTS;
   }
 
   if (!location.is_valid())
     return net::ERR_INVALID_URL;
 
   if (!job_->IsSafeRedirect(location)) {
@@ skipping 45 matching lines @@
   return context_.get();
 }
 
 void URLRequest::set_context(URLRequestContext* context) {
   scoped_refptr<URLRequestContext> prev_context = context_;
 
   context_ = context;
 
   // If the context this request belongs to has changed, update the tracker.
   if (prev_context != context) {
-    net_log_.EndEvent(net::NetLog::TYPE_REQUEST_ALIVE);
+    net_log_.EndEvent(net::NetLog::TYPE_REQUEST_ALIVE, NULL);
     net_log_ = net::BoundNetLog();
 
     if (context) {
       net_log_ = net::BoundNetLog::Make(context->net_log(),
                                         net::NetLog::SOURCE_URL_REQUEST);
-      net_log_.BeginEvent(net::NetLog::TYPE_REQUEST_ALIVE);
+      net_log_.BeginEvent(net::NetLog::TYPE_REQUEST_ALIVE, NULL);
     }
   }
 }
 
 int64 URLRequest::GetExpectedContentSize() const {
   int64 expected_content_size = -1;
   if (job_)
     expected_content_size = job_->expected_content_size();
 
   return expected_content_size;
 }
 
 URLRequest::UserData* URLRequest::GetUserData(const void* key) const {
   UserDataMap::const_iterator found = user_data_.find(key);
   if (found != user_data_.end())
     return found->second.get();
   return NULL;
 }
 
 void URLRequest::SetUserData(const void* key, UserData* data) {
   user_data_[key] = linked_ptr<UserData>(data);
 }