Index: net/disk_cache/disk_cache_test_util.h |
=================================================================== |
--- net/disk_cache/disk_cache_test_util.h (revision 18456) |
+++ net/disk_cache/disk_cache_test_util.h (working copy) |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2006-2009 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. |
@@ -11,6 +11,7 @@ |
#include "base/message_loop.h" |
#include "base/task.h" |
#include "base/timer.h" |
+#include "net/base/test_completion_callback.h" |
// Re-creates a given test file inside the cache test folder. |
bool CreateCacheTestFile(const wchar_t* name); |
@@ -53,7 +54,8 @@ |
// ----------------------------------------------------------------------- |
-// Simple callback to process IO completions from the cache. |
+// Simple callback to process IO completions from the cache. It allows tests |
+// with multiple simultaneous IO operations. |
class CallbackTest : public CallbackRunner< Tuple1<int> > { |
public: |
explicit CallbackTest(bool reuse) : result_(-1), reuse_(reuse ? 0 : 1) {} |
@@ -70,6 +72,24 @@ |
// ----------------------------------------------------------------------- |
+// Simple callback to process IO completions from the cache. This object is not |
+// intended to be used when multiple IO operations are in-flight at the same |
+// time. |
+class SimpleCallbackTest : public TestCompletionCallback { |
+ public: |
+ SimpleCallbackTest() {} |
+ ~SimpleCallbackTest() {} |
+ |
+ // Returns the final result of the IO operation. If |result| is |
+ // net::ERR_IO_PENDING, it waits for the callback be invoked. |
+ int GetResult(int result); |
+ |
+ private: |
+ DISALLOW_COPY_AND_ASSIGN(SimpleCallbackTest); |
+}; |
+ |
+// ----------------------------------------------------------------------- |
+ |
// Simple helper to deal with the message loop on a test. |
class MessageLoopHelper { |
public: |