NetLogEventParameter to Callback refactoring 11.

chrome/browser/net/chrome_network_delegate.cc

 // 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 "chrome/browser/net/chrome_network_delegate.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
@@ skipping 151 matching lines @@
     net::URLRequest* request,
     const net::CompletionCallback& callback,
     GURL* new_url) {
 #if defined(ENABLE_CONFIGURATION_POLICY)
   // TODO(joaodasilva): This prevents extensions from seeing URLs that are
   // blocked. However, an extension might redirect the request to another URL,
   // which is not blocked.
   if (url_blacklist_manager_ &&
       url_blacklist_manager_->IsURLBlocked(request->url())) {
     // URL access blocked by policy.
-    scoped_refptr<net::NetLog::EventParameters> params;
-    params = new net::NetLogStringParameter("url", request->url().spec());
     request->net_log().AddEvent(
-        net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST, params);
+        net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST,
+        net::NetLog::StringCallback("url", &request->url().spec()));

[eroman, 2012/06/14 18:04:31]

nit: might want to use possibly_invalid_spec() just in case

[mmenke, 2012/06/14 18:49:42]

Done.

     return net::ERR_NETWORK_ACCESS_DENIED;
   }
 #endif
 
   ForwardRequestStatus(REQUEST_STARTED, request, profile_);
 
   if (!enable_referrers_->GetValue())
     request->set_referrer(std::string());
   return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
       profile_, extension_info_map_.get(), request, callback, new_url);
@@ skipping 186 matching lines @@
       chrome::kExtensionScheme;
 }
 
 int ChromeNetworkDelegate::OnBeforeSocketStreamConnect(
     net::SocketStream* socket,
     const net::CompletionCallback& callback) {
 #if defined(ENABLE_CONFIGURATION_POLICY)
   if (url_blacklist_manager_ &&
       url_blacklist_manager_->IsURLBlocked(socket->url())) {
     // URL access blocked by policy.
-    scoped_refptr<net::NetLog::EventParameters> params;
-    params = new net::NetLogStringParameter("url", socket->url().spec());
     socket->net_log()->AddEvent(
-        net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST, params);
+        net::NetLog::TYPE_CHROME_POLICY_ABORTED_REQUEST,
+        net::NetLog::StringCallback("url", &socket->url().spec()));

[eroman, 2012/06/14 18:04:31]

ditto.

[mmenke, 2012/06/14 18:49:42]

Done.

     return net::ERR_NETWORK_ACCESS_DENIED;
   }
 #endif
   return net::OK;
 }