Index: base/test/thread_test_helper.h |
diff --git a/chrome/test/thread_test_helper.h b/base/test/thread_test_helper.h |
similarity index 53% |
rename from chrome/test/thread_test_helper.h |
rename to base/test/thread_test_helper.h |
index f5fb583067e5531638207d2703b3791f8a93f7f8..e6b32bc1d44f66e31b11048e808718d858146d8f 100644 |
--- a/chrome/test/thread_test_helper.h |
+++ b/base/test/thread_test_helper.h |
@@ -2,23 +2,24 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CHROME_TEST_THREAD_TEST_HELPER_H_ |
-#define CHROME_TEST_THREAD_TEST_HELPER_H_ |
+#ifndef BASE_TEST_THREAD_TEST_HELPER_H_ |
+#define BASE_TEST_THREAD_TEST_HELPER_H_ |
#pragma once |
#include "base/compiler_specific.h" |
#include "base/memory/ref_counted.h" |
+#include "base/message_loop_proxy.h" |
#include "base/synchronization/waitable_event.h" |
-#include "content/browser/browser_thread.h" |
+ |
+namespace base { |
// Helper class that executes code on a given thread while blocking on the |
-// invoking thread (normally the UI thread). To use, derive from this class and |
-// overwrite RunTest. An alternative use of this class is to use it directly. |
-// It will then block until all pending tasks on a given thread have been |
-// executed. |
-class ThreadTestHelper : public base::RefCountedThreadSafe<ThreadTestHelper> { |
+// invoking thread. To use, derive from this class and overwrite RunTest. An |
+// alternative use of this class is to use it directly. It will then block |
+// until all pending tasks on a given thread have been executed. |
+class ThreadTestHelper : public RefCountedThreadSafe<ThreadTestHelper> { |
public: |
- explicit ThreadTestHelper(BrowserThread::ID thread_id); |
+ explicit ThreadTestHelper(MessageLoopProxy* target_thread); |
// True if RunTest() was successfully executed on the target thread. |
bool Run() WARN_UNUSED_RESULT; |
@@ -26,7 +27,7 @@ class ThreadTestHelper : public base::RefCountedThreadSafe<ThreadTestHelper> { |
virtual void RunTest(); |
protected: |
- friend class base::RefCountedThreadSafe<ThreadTestHelper>; |
+ friend class RefCountedThreadSafe<ThreadTestHelper>; |
virtual ~ThreadTestHelper(); |
@@ -37,10 +38,12 @@ class ThreadTestHelper : public base::RefCountedThreadSafe<ThreadTestHelper> { |
void RunInThread(); |
bool test_result_; |
- BrowserThread::ID thread_id_; |
- base::WaitableEvent done_event_; |
+ scoped_refptr<MessageLoopProxy> target_thread_; |
+ WaitableEvent done_event_; |
DISALLOW_COPY_AND_ASSIGN(ThreadTestHelper); |
}; |
-#endif // CHROME_TEST_THREAD_TEST_HELPER_H_ |
+} // namespace base |
+ |
+#endif // BASE_TEST_THREAD_TEST_HELPER_H_ |