Introducing net::TestCompletionClosure.

net/base/test_completion_callback.h

 // 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.
 
 #ifndef NET_BASE_TEST_COMPLETION_CALLBACK_H_
 #define NET_BASE_TEST_COMPLETION_CALLBACK_H_
 
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/tuple.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 
 //-----------------------------------------------------------------------------
 // completion callback helper
 
 // A helper class for completion callbacks, designed to make it easy to run
 // tests involving asynchronous operations.  Just call WaitForResult to wait
@@ skipping 52 matching lines @@
 
   TestCompletionCallbackTemplate() : result_(R()) {}
   R result_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestCompletionCallbackTemplate);
 };
 
 }  // namespace internal
 
+class TestClosureCallback
+    : public internal::TestCompletionCallbackBaseInternal {
+ public:
+  TestClosureCallback();
+  ~TestClosureCallback();

[jkarlin, 2014/11/03 19:17:59]

virtual override

[gavinp, 2014/11/03 22:54:48]

Sure. I have to update a bunch of base classes; but this is safer.

+
+  using internal::TestCompletionCallbackBaseInternal::WaitForResult;

[jkarlin, 2014/11/03 19:17:59]

Why is this necessary?

[gavinp, 2014/11/03 22:54:48]

Because TestCompletionCallbackBaseInternal::WaitForResult() is protected; this
is the syntax to readvertise it as public from this descendent class. I've moved
the "using" line up to right under the public:, as seems to be our habit.

+
+  const base::Closure& callback() const { return callback_; }
+
+ private:
+  const base::Closure callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestClosureCallback);
+};
+
 // Base class overridden by custom implementations of TestCompletionCallback.
 typedef internal::TestCompletionCallbackTemplate<int>
     TestCompletionCallbackBase;
 
 typedef internal::TestCompletionCallbackTemplate<int64>
     TestInt64CompletionCallbackBase;
 
 class TestCompletionCallback : public TestCompletionCallbackBase {
  public:
   TestCompletionCallback();
@@ skipping 29 matching lines @@
  private:
   void SetResult(int result) override;
 
   IOBuffer* buffer_;
   DISALLOW_COPY_AND_ASSIGN(ReleaseBufferCompletionCallback);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_TEST_COMPLETION_CALLBACK_H_