Make NetLog take in callbacks that return Values

net/base/file_stream_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 "net/base/file_stream.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ skipping 20 matching lines @@
   IOBufferWithSize* buf = new IOBufferWithSize(kTestDataSize);
   memcpy(buf->data(), kTestData, kTestDataSize);
   return buf;
 }
 
 // This NetLog is used for notifying when a file stream is closed
 // (i.e. TYPE_FILE_STREAM_CLOSE event is recorded).
 class NetLogForNotifyingFileClosure : public NetLog {
  public:
   NetLogForNotifyingFileClosure()
-      : id_(0),
+      : last_id_(0),
         on_closure_(false /* manual_reset */, false /* initially_signaled */) {
   }
 
   // Wait until a file closure event is recorded.
   bool WaitForClosure() {
     const base::TimeDelta timeout(
         base::TimeDelta::FromMilliseconds(
             TestTimeouts::action_max_timeout_ms()));
     return on_closure_.TimedWait(timeout);
   }
 
   // NetLog overrides:
-  virtual void AddEntry(
-      EventType type,
-      const Source& source,
-      EventPhase phase,
-      const scoped_refptr<EventParameters>& params) OVERRIDE {
-    if (type == TYPE_FILE_STREAM_CLOSE) {
+  virtual void OnAddEntry(const net::NetLog::Entry& entry) OVERRIDE {
+    if (entry.type() == TYPE_FILE_STREAM_CLOSE)
       on_closure_.Signal();
-    }
   }
 
-  virtual uint32 NextID() OVERRIDE { return id_++; }
+  virtual uint32 NextID() OVERRIDE { return ++last_id_; }
   virtual LogLevel GetLogLevel() const OVERRIDE { return LOG_ALL; }
   virtual void AddThreadSafeObserver(ThreadSafeObserver* observer,
                                      LogLevel log_level) OVERRIDE {
     NOTIMPLEMENTED();
   }
   virtual void SetObserverLogLevel(ThreadSafeObserver* observer,
                                    LogLevel log_level) OVERRIDE {
     NOTIMPLEMENTED();
   }
   virtual void RemoveThreadSafeObserver(ThreadSafeObserver* observer) OVERRIDE {
     NOTIMPLEMENTED();
   }
 
  private:
-  uint32 id_;
+  uint32 last_id_;
   base::WaitableEvent on_closure_;
 };
 
 }  // namespace
 
 class FileStreamTest : public PlatformTest {
  public:
   virtual void SetUp() {
     PlatformTest::SetUp();
 
@@ skipping 1170 matching lines @@
   // Delete the stream without waiting for the close operation to be
   // complete. Should be safe.
   stream.reset();
   // close_callback won't be called.
   EXPECT_FALSE(close_callback.have_result());
 }
 
 }  // namespace
 
 }  // namespace net