Remove use of void** from HttpResponseHeaders::EnumerateHeaderLines

net/http/http_response_headers.cc

Index: net/http/http_response_headers.cc
diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc
index ba51cfdbc57355325c2e2224ffb2eed1a41cb745..7e0706bc94369a15a8bd551a5c97fdd3ce2174e0 100644
--- a/net/http/http_response_headers.cc
+++ b/net/http/http_response_headers.cc
@@ -313,10 +313,10 @@ void HttpResponseHeaders::RemoveHeaderLine(const std::string& name,
 
   new_raw_headers.reserve(raw_headers_.size());
 
-  void* iter = NULL;
+  size_t iter = 0;
   std::string old_header_name;
   std::string old_header_value;
-  while (EnumerateHeaderLines(&iter, &old_header_name, &old_header_value)) {
+  while (EnumerateHeaderLines(iter, &old_header_name, &old_header_value)) {
     std::string old_header_name_lowercase = base::ToLowerASCII(old_header_name);
     if (name_lowercase == old_header_name_lowercase &&
         value == old_header_value)
@@ -549,10 +549,9 @@ std::string HttpResponseHeaders::GetStatusText() const {
   return std::string(begin, end);
 }
 
-bool HttpResponseHeaders::EnumerateHeaderLines(void** iter,
+bool HttpResponseHeaders::EnumerateHeaderLines(size_t& i,
                                                std::string* name,
                                                std::string* value) const {
-  size_t i = reinterpret_cast<size_t>(*iter);
   if (i == parsed_.size())
     return false;
 
@@ -567,7 +566,6 @@ bool HttpResponseHeaders::EnumerateHeaderLines(void** iter,
 
   value->assign(value_begin, value_end);
 
-  *iter = reinterpret_cast<void*>(i);
   return true;
 }
 
@@ -1394,10 +1392,10 @@ scoped_ptr<base::Value> HttpResponseHeaders::NetLogCallback(
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   base::ListValue* headers = new base::ListValue();
   headers->Append(new base::StringValue(GetStatusLine()));
-  void* iterator = NULL;
+  size_t iterator = 0;
   std::string name;
   std::string value;
-  while (EnumerateHeaderLines(&iterator, &name, &value)) {
+  while (EnumerateHeaderLines(iterator, &name, &value)) {
     std::string log_value =
         ElideHeaderValueForNetLog(capture_mode, name, value);
     std::string escaped_name = EscapeNonASCII(name);