Add the URLRequest's method and load flags to the NetLog.

BUG=37421

Review URL: http://codereview.chromium.org/2108003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47321 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 54 insertions, 2 deletions

diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 701466e9a..81144af 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -18,6 +18,7 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_manager.h"
+#include "net/url_request/url_request_netlog_params.h"
 
 using base::Time;
 using net::UploadData;
@@ -267,8 +268,7 @@ void URLRequest::StartJob(URLRequestJob* job) {
 
   net_log_.BeginEvent(
       net::NetLog::TYPE_URL_REQUEST_START,
-      new net::NetLogStringParameter(
-          "url", original_url().possibly_invalid_spec()));
+      new URLRequestStartEventParameters(url_, method_, load_flags_));
 
   job_ = job;
   job_->SetExtraRequestHeaders(extra_request_headers_);
diff --git a/net/url_request/url_request_netlog_params.cc b/net/url_request/url_request_netlog_params.cc
new file mode 100644
index 0000000..d432e79
--- /dev/null
+++ b/net/url_request/url_request_netlog_params.cc
@@ -0,0 +1,20 @@
+// 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/url_request/url_request_netlog_params.h"
+
+#include "base/values.h"
+
+URLRequestStartEventParameters::URLRequestStartEventParameters(
+    const GURL& url, const std::string& method, int load_flags)
+    : url_(url), method_(method), load_flags_(load_flags) {}
+
+Value* URLRequestStartEventParameters::ToValue() const {
+  DictionaryValue* dict = new DictionaryValue();
+  dict->SetString(L"url", url_.possibly_invalid_spec());
+  dict->SetString(L"method", method_);
+  dict->SetInteger(L"load_flags", load_flags_);
+  return dict;
+}
+
diff --git a/net/url_request/url_request_netlog_params.h b/net/url_request/url_request_netlog_params.h
new file mode 100644
index 0000000..45c9791
--- /dev/null
+++ b/net/url_request/url_request_netlog_params.h
@@ -0,0 +1,32 @@
+// 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.
+
+#ifndef NET_URL_REQUEST_URL_REQUEST_NETLOG_PARAMS_H_
+#define NET_URL_REQUEST_URL_REQUEST_NETLOG_PARAMS_H_
+
+#include <string>
+
+#include "googleurl/src/gurl.h"
+#include "net/base/net_log.h"
+
+// Holds the parameters to emit to the NetLog when starting a URLRequest.
+class URLRequestStartEventParameters : public net::NetLog::EventParameters {
+ public:
+  URLRequestStartEventParameters(const GURL& url,
+                                 const std::string& method,
+                                 int load_flags);
+
+  const GURL& url() const {
+    return url_;
+  }
+
+  virtual Value* ToValue() const;
+
+ private:
+  const GURL url_;
+  const std::string method_;
+  const int load_flags_;
+};
+
+#endif  // NET_URL_REQUEST_URL_REQUEST_NETLOG_PARAMS_H_