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

net/log/net_log_util.cc

 // Copyright 2014 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/log/net_log_util.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 110 matching lines @@
     return true;
   if (request1->creation_time() > request2->creation_time())
     return false;
   // If requests were created at the same time, sort by ID.  Mostly matters for
   // testing purposes.
   return request1->identifier() < request2->identifier();
 }
 
 // Returns a Value representing the state of a pre-existing URLRequest when
 // net-internals was opened.
-base::Value* GetRequestStateAsValue(const net::URLRequest* request,
-                                    NetLogCaptureMode capture_mode) {
-  return request->GetStateAsValue().release();
+scoped_ptr<base::Value> GetRequestStateAsValue(const net::URLRequest* request,
+                                               NetLogCaptureMode capture_mode) {
+  return request->GetStateAsValue().Pass();
 }
 
 }  // namespace
 
 scoped_ptr<base::DictionaryValue> GetNetConstants() {
   scoped_ptr<base::DictionaryValue> constants_dict(new base::DictionaryValue());
 
   // Version of the file format.
   constants_dict->SetInteger("logFormatVersion", kLogFormatVersion);
 
@@ skipping 177 matching lines @@
   // May only be called on the context's thread.
   DCHECK(context->CalledOnValidThread());
 
   scoped_ptr<base::DictionaryValue> net_info_dict(new base::DictionaryValue());
 
   // TODO(mmenke):  The code for most of these sources should probably be moved
   // into the sources themselves.
   if (info_sources & NET_INFO_PROXY_SETTINGS) {
     ProxyService* proxy_service = context->proxy_service();
 
-    base::DictionaryValue* dict = new base::DictionaryValue();
+    scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
     if (proxy_service->fetched_config().is_valid())
       dict->Set("original", proxy_service->fetched_config().ToValue());
     if (proxy_service->config().is_valid())
       dict->Set("effective", proxy_service->config().ToValue());
 
-    net_info_dict->Set(NetInfoSourceToString(NET_INFO_PROXY_SETTINGS), dict);
+    net_info_dict->Set(NetInfoSourceToString(NET_INFO_PROXY_SETTINGS),
+                       dict.get());
   }
 
   if (info_sources & NET_INFO_BAD_PROXIES) {
     const ProxyRetryInfoMap& bad_proxies_map =
         context->proxy_service()->proxy_retry_info();
 
-    base::ListValue* list = new base::ListValue();
+    scoped_ptr<base::ListValue> list(new base::ListValue());
 
     for (ProxyRetryInfoMap::const_iterator it = bad_proxies_map.begin();
          it != bad_proxies_map.end(); ++it) {
       const std::string& proxy_uri = it->first;
       const ProxyRetryInfo& retry_info = it->second;
 
-      base::DictionaryValue* dict = new base::DictionaryValue();
+      scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
       dict->SetString("proxy_uri", proxy_uri);
       dict->SetString("bad_until",
                       NetLog::TickCountToString(retry_info.bad_until));
 
-      list->Append(dict);
+      list->Append(dict.Pass());
     }
 
-    net_info_dict->Set(NetInfoSourceToString(NET_INFO_BAD_PROXIES), list);
+    net_info_dict->Set(NetInfoSourceToString(NET_INFO_BAD_PROXIES),
+                       list.Pass());
   }
 
   if (info_sources & NET_INFO_HOST_RESOLVER) {
     HostResolver* host_resolver = context->host_resolver();
     DCHECK(host_resolver);
     HostCache* cache = host_resolver->GetHostCache();
     if (cache) {
-      base::DictionaryValue* dict = new base::DictionaryValue();
-      base::Value* dns_config = host_resolver->GetDnsConfigAsValue();
+      scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
+      scoped_ptr<base::Value> dns_config(host_resolver->GetDnsConfigAsValue());
       if (dns_config)
-        dict->Set("dns_config", dns_config);
+        dict->Set("dns_config", dns_config.Pass());
 
       dict->SetInteger(
           "default_address_family",
           static_cast<int>(host_resolver->GetDefaultAddressFamily()));
 
       base::DictionaryValue* cache_info_dict = new base::DictionaryValue();
 
       cache_info_dict->SetInteger("capacity",
                                   static_cast<int>(cache->max_entries()));
 
-      base::ListValue* entry_list = new base::ListValue();
+      scoped_ptr<base::ListValue> entry_list(new base::ListValue());
 
       HostCache::EntryMap::Iterator it(cache->entries());
       for (; it.HasNext(); it.Advance()) {
         const HostCache::Key& key = it.key();
         const HostCache::Entry& entry = it.value();
 
-        base::DictionaryValue* entry_dict = new base::DictionaryValue();
+        scoped_ptr<base::DictionaryValue> entry_dict(
+            new base::DictionaryValue());
 
         entry_dict->SetString("hostname", key.hostname);
         entry_dict->SetInteger("address_family",
                                static_cast<int>(key.address_family));
         entry_dict->SetString("expiration",
                               NetLog::TickCountToString(it.expiration()));
 
         if (entry.error != OK) {
           entry_dict->SetInteger("error", entry.error);
         } else {
           // Append all of the resolved addresses.
-          base::ListValue* address_list = new base::ListValue();
+          scoped_ptr<base::ListValue> address_list(new base::ListValue());
           for (size_t i = 0; i < entry.addrlist.size(); ++i) {
             address_list->AppendString(entry.addrlist[i].ToStringWithoutPort());
           }
-          entry_dict->Set("addresses", address_list);
+          entry_dict->Set("addresses", address_list.Pass());
         }
 
-        entry_list->Append(entry_dict);
+        entry_list->Append(entry_dict.Pass());
       }
 
-      cache_info_dict->Set("entries", entry_list);
+      cache_info_dict->Set("entries", entry_list.Pass());
       dict->Set("cache", cache_info_dict);
-      net_info_dict->Set(NetInfoSourceToString(NET_INFO_HOST_RESOLVER), dict);
+      net_info_dict->Set(NetInfoSourceToString(NET_INFO_HOST_RESOLVER),
+                         dict.get());
     }
   }
 
   HttpNetworkSession* http_network_session =
       context->http_transaction_factory()->GetSession();
 
   if (info_sources & NET_INFO_SOCKET_POOL) {
     net_info_dict->Set(NetInfoSourceToString(NET_INFO_SOCKET_POOL),
                        http_network_session->SocketPoolInfoToValue());
   }
@@ skipping 89 matching lines @@
     }
   }
 
   // Sort by creation time.
   std::sort(requests.begin(), requests.end(), RequestCreatedBefore);
 
   // Create fake events.
   ScopedVector<NetLog::Entry> entries;
   for (const auto& request : requests) {
     NetLog::ParametersCallback callback =
-        base::Bind(&GetRequestStateAsValue, base::Unretained(request));
+        base::Bind(GetRequestStateAsValue, base::Unretained(request));
 
     // Note that passing the hardcoded NetLogCaptureMode::Default() below is
     // fine, since GetRequestStateAsValue() ignores the capture mode.
     NetLog::EntryData entry_data(
         NetLog::TYPE_REQUEST_ALIVE, request->net_log().source(),
         NetLog::PHASE_BEGIN, request->creation_time(), &callback);
     NetLog::Entry entry(&entry_data, NetLogCaptureMode::Default());
     observer->OnAddEntry(entry);
   }
 }
 
 }  // namespace net