NetLogEventParameter to Callback refactoring 8.

net/websockets/websocket_net_log_params.cc

Index: net/websockets/websocket_net_log_params.cc
===================================================================
--- net/websockets/websocket_net_log_params.cc	(revision 141995)
+++ net/websockets/websocket_net_log_params.cc	(working copy)
@@ -4,37 +4,36 @@
 
 #include "net/websockets/websocket_net_log_params.h"
 
+#include "base/stringprintf.h"
+#include "base/values.h"
+
 namespace net {
 
-NetLogWebSocketHandshakeParameter::NetLogWebSocketHandshakeParameter(
-    const std::string& headers)
-    : headers_(headers) {
-}
-
-Value* NetLogWebSocketHandshakeParameter::ToValue() const {
+Value* NetLogWebSocketHandshakeCallback(const std::string* headers,

[eroman, 2012/06/14 17:19:40]

side-comment (no action necessary): I wonder why this is transforming the
input... I think in general it is better to pass the data down untouched for
debugging purposes.

[mmenke, 2012/06/14 17:30:06]

Does seem like a lot of work for an unclear purpose.

WebSockets are being re-implemented, anyways, so suspect this code will be gone
within a quarter or two.

+                                        NetLog::LogLevel /* log_level */) {
   DictionaryValue* dict = new DictionaryValue();
-  ListValue* headers = new ListValue();
+  ListValue* header_list = new ListValue();
 
   size_t last = 0;
-  size_t headers_size = headers_.size();
+  size_t headers_size = headers->size();
   size_t pos = 0;
   while (pos <= headers_size) {
     if (pos == headers_size ||
-        (headers_[pos] == '\r' &&
-         pos + 1 < headers_size && headers_[pos + 1] == '\n')) {
-      std::string entry = headers_.substr(last, pos - last);
+        ((*headers)[pos] == '\r' &&
+         pos + 1 < headers_size && (*headers)[pos + 1] == '\n')) {
+      std::string entry = headers->substr(last, pos - last);
       pos += 2;
       last = pos;
 
-      headers->Append(new StringValue(entry));
+      header_list->Append(new StringValue(entry));
 
       if (entry.empty()) {
         // Dump WebSocket key3.
         std::string key;
         for (; pos < headers_size; ++pos) {
-          key += base::StringPrintf("\\x%02x", headers_[pos] & 0xff);
+          key += base::StringPrintf("\\x%02x", (*headers)[pos] & 0xff);
         }
-        headers->Append(new StringValue(key));
+        header_list->Append(new StringValue(key));
         break;
       }
     } else {
@@ -42,10 +41,8 @@
     }
   }
 
-  dict->Set("headers", headers);
+  dict->Set("headers", header_list);
   return dict;
 }
 
-NetLogWebSocketHandshakeParameter::~NetLogWebSocketHandshakeParameter() {}
-
 }  // namespace net