Make NetLog take in callbacks that return Values

net/http/http_response_headers.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_RESPONSE_HEADERS_H_
 #define NET_HTTP_HTTP_RESPONSE_HEADERS_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "net/base/net_export.h"
+#include "net/base/net_log.h"
 #include "net/http/http_version.h"
 
 class Pickle;
 class PickleIterator;
 
 namespace base {
 class Time;
 class TimeDelta;
+class Value;
 }
 
 namespace net {
 
 // HttpResponseHeaders: parses and holds HTTP response headers.
 class NET_EXPORT HttpResponseHeaders
     : public base::RefCountedThreadSafe<HttpResponseHeaders> {
  public:
   // Persist options.
   typedef int PersistOptions;
@@ skipping 203 matching lines @@
   // |*last_byte_position| = inclusive position of the last byte of the range
   // |*instance_length| = size in bytes of the object requested
   // If any of the above values is unknown, its value will be -1.
   bool GetContentRange(int64* first_byte_position,
                        int64* last_byte_position,
                        int64* instance_length) const;
 
   // Returns true if the response is chunk-encoded.
   bool IsChunkEncoded() const;
 
+  // Returns a Value for use with the NetLog containing the response headers.

[eroman, 2012/06/06 21:27:11]

optional nit: Returns --> Creates (to imply caller takes ownership)

[mmenke, 2012/06/07 19:20:46]

Done.

+  base::Value* NetLogCallback(NetLog::LogLevel log_level) const;
+
+  // Takes in a Value created by the above function, and attempts to extract the
+  // original response headers.  Returns a duplicate of the original headers
+  // on success.  On failure, returns NULL.
+  // TODO(mmenke):  Long term, we want to remove this, and migrate external
+  //                consumers to be NetworkDelegates.
+  static scoped_refptr<HttpResponseHeaders> FromNetLogParam(

[eroman, 2012/06/06 21:27:11]

nit: for consistency with the other converters, I suggest making this return a
bool.

[mmenke, 2012/06/07 19:20:46]

Done.

+      const base::Value* event_param);
+
   // Returns the HTTP response code.  This is 0 if the response code text seems
   // to exist but could not be parsed.  Otherwise, it defaults to 200 if the
   // response code is not found in the raw headers.
   int response_code() const { return response_code_; }
 
   // Returns the raw header string.
   const std::string& raw_headers() const { return raw_headers_; }
 
  private:
   friend class base::RefCountedThreadSafe<HttpResponseHeaders>;
@@ skipping 103 matching lines @@
 
   // The parsed http version number (not normalized).
   HttpVersion parsed_http_version_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpResponseHeaders);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_RESPONSE_HEADERS_H_