Cleanup: Address some of the todos in 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 242 matching lines @@
   StartJob(GetJobManager()->CreateJob(this));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void URLRequest::StartJob(URLRequestJob* job) {
   DCHECK(!is_pending_);
   DCHECK(!job_);
 
   net_log_.BeginEventWithString(net::NetLog::TYPE_URL_REQUEST_START,
-                                original_url().possibly_invalid_spec());
+                                "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 87 matching lines @@
   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,
-                                 status_.os_error());
+                                 "net_error", status_.os_error());
   } else {
     net_log_.EndEvent(net::NetLog::TYPE_URL_REQUEST_START);
   }
 
   URLRequestJob* job = GetJobManager()->MaybeInterceptResponse(this);
   if (job) {
     RestartWithJob(job);
   } else if (delegate_) {
     delegate_->OnResponseStarted(this);
   }
@@ skipping 56 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_.AddString(StringPrintf("Redirected (%d) to %s",
-        http_status_code, location.spec().c_str()));
+    net_log_.AddEventWithString(net::NetLog::TYPE_URL_REQUEST_REDIRECTED,
+                                "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 74 matching lines @@
 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);
 }