Update NetLog to be thread safe.

chrome/browser/net/passive_log_collector_unittest.cc

 // Copyright (c) 2010 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/passive_log_collector.h"
 
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/string_util.h"
 #include "net/url_request/url_request_netlog_params.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 typedef PassiveLogCollector::RequestTracker RequestTracker;
 typedef PassiveLogCollector::SourceInfoList SourceInfoList;
 typedef PassiveLogCollector::SocketTracker SocketTracker;
 using net::NetLog;
 
 const NetLog::SourceType kSourceType = NetLog::SOURCE_NONE;
 
-PassiveLogCollector::Entry MakeStartLogEntryWithURL(int source_id,
-                                                    const std::string& url) {
-  return PassiveLogCollector::Entry(
+ChromeNetLog::Entry MakeStartLogEntryWithURL(int source_id,
+                                             const std::string& url) {
+  return ChromeNetLog::Entry(
       0,
       NetLog::TYPE_URL_REQUEST_START_JOB,
       base::TimeTicks(),
       NetLog::Source(kSourceType, source_id),
       NetLog::PHASE_BEGIN,
       new URLRequestStartEventParameters(GURL(url), "GET", 0, net::LOW));
 }
 
-PassiveLogCollector::Entry MakeStartLogEntry(int source_id) {
+ChromeNetLog::Entry MakeStartLogEntry(int source_id) {
   return MakeStartLogEntryWithURL(source_id,
                                   StringPrintf("http://req%d", source_id));
 }
 
-PassiveLogCollector::Entry MakeEndLogEntry(int source_id) {
-  return PassiveLogCollector::Entry(
+ChromeNetLog::Entry MakeEndLogEntry(int source_id) {
+  return ChromeNetLog::Entry(
       0,
       NetLog::TYPE_REQUEST_ALIVE,
       base::TimeTicks(),
       NetLog::Source(kSourceType, source_id),
       NetLog::PHASE_END,
       NULL);
 }
 
 bool OrderBySourceID(const PassiveLogCollector::SourceInfo& a,
                      const PassiveLogCollector::SourceInfo& b) {
@@ skipping 119 matching lines @@
   ASSERT_EQ(2u, GetDeadSources(tracker).size());
   EXPECT_EQ(url2, GetDeadSources(tracker)[0].GetURL());
   EXPECT_EQ(url3, GetDeadSources(tracker)[1].GetURL());
 }
 
 TEST(SpdySessionTracker, MovesToGraveyard) {
   PassiveLogCollector::SpdySessionTracker tracker;
   EXPECT_EQ(0u, GetLiveSources(tracker).size());
   EXPECT_EQ(0u, GetDeadSources(tracker).size());
 
-  PassiveLogCollector::Entry begin(
+  ChromeNetLog::Entry begin(
       0u,
       NetLog::TYPE_SPDY_SESSION,
       base::TimeTicks(),
       NetLog::Source(NetLog::SOURCE_SPDY_SESSION, 1),
       NetLog::PHASE_BEGIN,
       NULL);
 
   tracker.OnAddEntry(begin);
   EXPECT_EQ(1u, GetLiveSources(tracker).size());
   EXPECT_EQ(0u, GetDeadSources(tracker).size());
 
-  PassiveLogCollector::Entry end(
+  ChromeNetLog::Entry end(
       0u,
       NetLog::TYPE_SPDY_SESSION,
       base::TimeTicks(),
       NetLog::Source(NetLog::SOURCE_SPDY_SESSION, 1),
       NetLog::PHASE_END,
       NULL);
 
   tracker.OnAddEntry(end);
   EXPECT_EQ(0u, GetLiveSources(tracker).size());
   EXPECT_EQ(1u, GetDeadSources(tracker).size());
@@ skipping 283 matching lines @@
     log.OnAddEntry(net::NetLog::TYPE_REQUEST_ALIVE,
                    base::TimeTicks(),
                    net::NetLog::Source(net::NetLog::SOURCE_URL_REQUEST, i),
                    net::NetLog::PHASE_END,
                    NULL);
   }
 
   // To pass, this should simply not have DCHECK-ed above.
 }