Make NetLog take in callbacks that return Values rather

than refcounted objects.  Avoids the need to create
classes and copy data.  Also no longer get time whenever
an event is logged.

BUG=126243

Review URL: https://chromiumcodereview.appspot.com/10399083

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

1 files changed, 20 insertions, 1 deletions

diff --git a/net/http/http_request_headers_unittest.cc b/net/http/http_request_headers_unittest.cc
index 384ceeb..6346f50 100644
--- a/net/http/http_request_headers_unittest.cc
+++ b/net/http/http_request_headers_unittest.cc
@@ -1,9 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/http/http_request_headers.h"
 
+#include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
@@ -163,6 +164,24 @@ TEST(HttpRequestHeaders, CopyFrom) {
   EXPECT_EQ("B: b\r\nC: c\r\n\r\n", headers.ToString());
 }
 
+TEST(HttpRequestHeaders, ToNetLogParamAndBackAgain) {
+  HttpRequestHeaders headers;
+  headers.SetHeader("B", "b");
+  headers.SetHeader("A", "a");
+  std::string request_line("GET /stuff");
+
+  scoped_ptr<base::Value> event_param(
+      headers.NetLogCallback(&request_line, NetLog::LOG_ALL_BUT_BYTES));
+  HttpRequestHeaders headers2;
+  std::string request_line2;
+
+  ASSERT_TRUE(HttpRequestHeaders::FromNetLogParam(event_param.get(),
+                                                  &headers2,
+                                                  &request_line2));
+  EXPECT_EQ(request_line, request_line2);
+  EXPECT_EQ("B: b\r\nA: a\r\n\r\n", headers2.ToString());
+}
+
 }  // namespace
 
 }  // namespace net