Updated NetLog::ParametersCallback & all related calbacks returning value as scoped_ptr<base::Value…

net/http/http_cache_transaction.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 "net/http/http_cache_transaction.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_POSIX)
 #include <unistd.h>
@@ skipping 164 matching lines @@
 
 void RecordNoStoreHeaderHistogram(int load_flags,
                                   const HttpResponseInfo* response) {
   if (load_flags & LOAD_MAIN_FRAME) {
     UMA_HISTOGRAM_BOOLEAN(
         "Net.MainFrameNoStore",
         response->headers->HasHeaderValue("cache-control", "no-store"));
   }
 }
 
-base::Value* NetLogAsyncRevalidationInfoCallback(
+scoped_ptr<base::Value> NetLogAsyncRevalidationInfoCallback(
     const NetLog::Source& source,
     const HttpRequestInfo* request,
     NetLogCaptureMode capture_mode) {
-  base::DictionaryValue* dict = new base::DictionaryValue();
-  source.AddToEventParameters(dict);
+  scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
+  source.AddToEventParameters(dict.get());
 
   dict->SetString("url", request->url.possibly_invalid_spec());
   dict->SetString("method", request->method);
-  return dict;
+  return dict.Pass();
 }
 
 enum ExternallyConditionalizedType {
   EXTERNALLY_CONDITIONALIZED_CACHE_REQUIRES_VALIDATION,
   EXTERNALLY_CONDITIONALIZED_CACHE_USABLE,
   EXTERNALLY_CONDITIONALIZED_MISMATCHED_VALIDATORS,
   EXTERNALLY_CONDITIONALIZED_MAX
 };
 
 }  // namespace
@@ skipping 2399 matching lines @@
 
 void HttpCache::Transaction::TriggerAsyncValidation() {
   DCHECK(!request_->upload_data_stream);
   BoundNetLog async_revalidation_net_log(
       BoundNetLog::Make(net_log_.net_log(), NetLog::SOURCE_ASYNC_REVALIDATION));
   net_log_.AddEvent(
       NetLog::TYPE_HTTP_CACHE_VALIDATE_RESOURCE_ASYNC,
       async_revalidation_net_log.source().ToEventParametersCallback());
   async_revalidation_net_log.BeginEvent(
       NetLog::TYPE_ASYNC_REVALIDATION,
-      base::Bind(
-          &NetLogAsyncRevalidationInfoCallback, net_log_.source(), request_));
+      base::Bind(NetLogAsyncRevalidationInfoCallback, net_log_.source(),
+                 request_));
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&HttpCache::PerformAsyncValidation,
                  cache_,  // cache_ is a weak pointer.
                  *request_,
                  async_revalidation_net_log));
 }
 
 void HttpCache::Transaction::FailRangeRequest() {
   response_ = *new_response_;
@@ skipping 353 matching lines @@
     default:
       NOTREACHED();
   }
 }
 
 void HttpCache::Transaction::OnIOComplete(int result) {
   DoLoop(result);
 }
 
 }  // namespace net