Make NetLog take in callbacks that return Values

chrome/browser/net/chrome_net_log_unittest.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_net_log.h"
 
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const int kThreads = 10;
 const int kEvents = 100;
 
 class CountingObserver : public net::NetLog::ThreadSafeObserver {
  public:
   CountingObserver() : count_(0) {}
 
   ~CountingObserver() {
     if (net_log())
       net_log()->RemoveThreadSafeObserver(this);
   }
 
-  virtual void OnAddEntry(net::NetLog::EventType type,
-                          const base::TimeTicks& time,
-                          const net::NetLog::Source& source,
-                          net::NetLog::EventPhase phase,
-                          net::NetLog::EventParameters* params) OVERRIDE {
+  virtual void OnAddEntry(const net::NetLog::Entry& entry) OVERRIDE {
     ++count_;
   }
 
   int count() const { return count_; }
 
  private:
   int count_;
 };
 
 void AddEvent(ChromeNetLog* net_log) {
-  net_log->AddGlobalEntry(net::NetLog::TYPE_CANCELLED, NULL);
+  net_log->AddGlobalEntry(net::NetLog::TYPE_CANCELLED);
 }
 
 // A thread that waits until an event has been signalled before calling
 // RunTestThread.
 class ChromeNetLogTestThread : public base::SimpleThread {
  public:
   ChromeNetLogTestThread() : base::SimpleThread("ChromeNetLogTest"),
                              net_log_(NULL),
                              start_event_(NULL) {
   }
@@ skipping 215 matching lines @@
 // threads works.
 TEST(ChromeNetLogTest, NetLogAddRemoveObserverThreads) {
   ChromeNetLog net_log;
 
   // Run a bunch of threads to completion, each of which will repeatedly add
   // and remove an observer, and set its logging level.
   RunTestThreads<AddRemoveObserverTestThread>(&net_log);
 }
 
 }  // namespace