Convert base::Bind and friends in http_server_fuzzer and stress_cache.

Also update comment in disk_cache::SimpleBackendImpl, and remove some
things that are not used.

Bug: 1007815
Change-Id: I5e239877a52a9906a8e42b62a00a40506e98f89a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2288273
Commit-Queue: Steve Kobes <skobes@chromium.org>
Reviewed-by: David Benjamin <davidben@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786520}

net/disk_cache/simple/simple_backend_impl.cc

@@ -653,8 +653,8 @@ size_t SimpleBackendImpl::DumpMemoryStats(
 
   size_t size = base::trace_event::EstimateMemoryUsage(index_) +
                 base::trace_event::EstimateMemoryUsage(active_entries_);
-  // TODO(xunjieli): crbug.com/669108. Track |entries_pending_doom_| once
-  // base::Closure is suppported in memory_usage_estimator.h.
+  // TODO(xunjieli): crbug.com/669108. Track |post_doom_waiting_| once
+  // base::OnceClosure is supported in memory_usage_estimator.h.
   dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes, size);
   return size;

net/nqe/network_qualities_prefs_manager.h

@@ -22,11 +22,6 @@
 namespace net {
 class NetworkQualityEstimator;
 
-typedef base::Callback<void(
-    const nqe::internal::NetworkID& network_id,
-    const nqe::internal::CachedNetworkQuality& cached_network_quality)>
-    OnChangeInCachedNetworkQualityCallback;
-
 typedef std::map<nqe::internal::NetworkID, nqe::internal::CachedNetworkQuality>
     ParsedPrefs;
 

net/server/http_server_fuzzer.cc

@@ -18,10 +18,10 @@ namespace {
 class WaitTillHttpCloseDelegate : public net::HttpServer::Delegate {
  public:
   WaitTillHttpCloseDelegate(FuzzedDataProvider* data_provider,
-                            const base::Closure& done_closure)
+                            base::OnceClosure done_closure)
       : server_(nullptr),
         data_provider_(data_provider),
-        done_closure_(done_closure),
+        done_closure_(std::move(done_closure)),
         action_flags_(data_provider_->ConsumeIntegral<uint8_t>()) {}
 
   void set_server(net::HttpServer* server) { server_ = server; }
@@ -70,7 +70,11 @@ class WaitTillHttpCloseDelegate : public net::HttpServer::Delegate {
     }
   }
 
-  void OnClose(int connection_id) override { done_closure_.Run(); }
+  void OnClose(int connection_id) override {
+    // In general, OnClose can be called more than once, but FuzzedServerSocket
+    // only makes one connection, and it is the only socket of interest here.
+    std::move(done_closure_).Run();
+  }
 
  private:
   enum {
@@ -83,7 +87,7 @@ class WaitTillHttpCloseDelegate : public net::HttpServer::Delegate {
 
   net::HttpServer* server_;
   FuzzedDataProvider* const data_provider_;
-  base::Closure done_closure_;
+  base::OnceClosure done_closure_;
   const uint8_t action_flags_;
 
   DISALLOW_COPY_AND_ASSIGN(WaitTillHttpCloseDelegate);

net/tools/quic/quic_simple_server_packet_writer.cc

@@ -30,9 +30,6 @@ void QuicSimpleServerPacketWriter::OnWriteComplete(int rv) {
   write_blocked_ = false;
   quic::WriteResult result(
       rv < 0 ? quic::WRITE_STATUS_ERROR : quic::WRITE_STATUS_OK, rv);
-  if (!callback_.is_null()) {
-    std::move(callback_).Run(result);
-  }
   dispatcher_->OnCanWrite();
 }
 

net/tools/quic/quic_simple_server_packet_writer.h

@@ -29,8 +29,6 @@ namespace net {
 // data.
 class QuicSimpleServerPacketWriter : public quic::QuicPacketWriter {
  public:
-  typedef base::Callback<void(quic::WriteResult)> WriteCallback;
-
   QuicSimpleServerPacketWriter(UDPServerSocket* socket,
                                quic::QuicDispatcher* dispatcher);
   ~QuicSimpleServerPacketWriter() override;
@@ -61,9 +59,6 @@ class QuicSimpleServerPacketWriter : public quic::QuicPacketWriter {
   // To be notified after every successful asynchronous write.
   quic::QuicDispatcher* dispatcher_;
 
-  // To call once the write completes.
-  WriteCallback callback_;
-
   // Whether a write is currently in flight.
   bool write_blocked_;
 

net/tools/stress_cache/stress_cache.cc

@@ -402,7 +402,7 @@ int main(int argc, const char* argv[]) {
     return MasterCode();
 
   logging::ScopedLogAssertHandler scoped_assert_handler(
-      base::Bind(CrashHandler));
+      base::BindRepeating(CrashHandler));
 
 #if defined(OS_WIN)
   logging::LogEventProvider::Initialize(kStressCacheTraceProviderName);