Add a source id to global NetLog entries.

net/proxy/proxy_service.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/proxy/proxy_service.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 1247 matching lines @@
 
   for (ProxyRetryInfoMap::const_iterator iter = new_retry_info.begin();
        iter != new_retry_info.end(); ++iter) {
     ProxyRetryInfoMap::iterator existing = proxy_retry_info_.find(iter->first);
     if (existing == proxy_retry_info_.end())
       proxy_retry_info_[iter->first] = iter->second;
     else if (existing->second.bad_until < iter->second.bad_until)
       existing->second.bad_until = iter->second.bad_until;
   }
   if (net_log_) {
-    net_log_->AddEntry(NetLog::TYPE_BAD_PROXY_LIST_REPORTED,
-                       TimeTicks::Now(),
-                       NetLog::Source(),
-                       NetLog::PHASE_NONE,
-                       make_scoped_refptr(
-                           new BadProxyListNetLogParam(new_retry_info)));
+    net_log_->AddGlobalEntry(
+        NetLog::TYPE_BAD_PROXY_LIST_REPORTED,
+        make_scoped_refptr(
+            new BadProxyListNetLogParam(new_retry_info)));
   }
 }
 
 void ProxyService::CancelPacRequest(PacRequest* req) {
   DCHECK(CalledOnValidThread());
   DCHECK(req);
   req->Cancel();
   RemovePendingRequest(req);
 }
 
@@ skipping 182 matching lines @@
       break;
     case ProxyConfigService::CONFIG_UNSET:
       effective_config = ProxyConfig::CreateDirect();
       break;
   }
 
   // Emit the proxy settings change to the NetLog stream.
   if (net_log_) {
     scoped_refptr<NetLog::EventParameters> params(
         new ProxyConfigChangedNetLogParam(fetched_config_, effective_config));
-    net_log_->AddEntry(net::NetLog::TYPE_PROXY_CONFIG_CHANGED,
-                       TimeTicks::Now(),
-                       NetLog::Source(),
-                       NetLog::PHASE_NONE,
-                       params);
+    net_log_->AddGlobalEntry(net::NetLog::TYPE_PROXY_CONFIG_CHANGED,
+                                params);
   }
 
   // Set the new configuration as the most recently fetched one.
   fetched_config_ = effective_config;
   fetched_config_.set_id(1);  // Needed for a later DCHECK of is_valid().
 
   InitializeUsingLastFetchedConfig();
 }
 
 void ProxyService::InitializeUsingLastFetchedConfig() {
@@ skipping 131 matching lines @@
     OnCompletion(result_);
   }
 }
 
 void SyncProxyServiceHelper::OnCompletion(int rv) {
   result_ = rv;
   event_.Signal();
 }
 
 }  // namespace net