NetLogEventParameter to Callback refactoring 1,

net/base/address_list.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_BASE_ADDRESS_LIST_H_
 #define NET_BASE_ADDRESS_LIST_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_export.h"
+#include "net/base/net_log.h"
 #include "net/base/net_util.h"
 
 struct addrinfo;
 
+namespace base {
+class Value;

[eroman, 2012/06/11 23:42:25]

I believe net_log.h already declares this.

[mmenke, 2012/06/12 00:42:19]

Done.

+}
+
 namespace net {
 
 class NET_EXPORT AddressList
     : NON_EXPORTED_BASE(private std::vector<IPEndPoint>) {
  public:
   AddressList();
   ~AddressList();
 
   // Creates an address list for a single IP literal.
   explicit AddressList(const IPEndPoint& endpoint);
@@ skipping 13 matching lines @@
     return canonical_name_;
   }
 
   void set_canonical_name(const std::string& canonical_name) {
     canonical_name_ = canonical_name;
   }
 
   // Sets canonical name to the literal of the first IP address on the list.
   void SetDefaultCanonicalName();
 
+  // Creates a Value for use with the NetLog containing the address list.
+  base::Value* NetLogCallback(NetLog::LogLevel log_level) const;

[eroman, 2012/06/11 23:42:25]

Given the usecases of this, might consider making it like:

Callback CreateNetlogParamsCallback();

To avoid all the callers doing the Bind stuff.

[mmenke, 2012/06/12 00:42:19]

Done, though used "CreateNetLogCallback" instead.  Decided early that
NetLogParamsCallback was too long to append everywhere, so used NetLogCallback
instead.

+
   // Exposed methods from std::vector.
   using std::vector<IPEndPoint>::size;
   using std::vector<IPEndPoint>::empty;
   using std::vector<IPEndPoint>::clear;
   using std::vector<IPEndPoint>::reserve;
   using std::vector<IPEndPoint>::capacity;
   using std::vector<IPEndPoint>::operator[];
   using std::vector<IPEndPoint>::front;
   using std::vector<IPEndPoint>::back;
   using std::vector<IPEndPoint>::push_back;
@@ skipping 10 matching lines @@
    // TODO(szym): Remove. http://crbug.com/126134
   std::string canonical_name_;
 };
 
 // Sets the port on each element in |list| to |port|.
 void NET_EXPORT SetPortOnAddressList(uint16 port, AddressList* list);
 
 }  // namespace net
 
 #endif  // NET_BASE_ADDRESS_LIST_H_