Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1136)

Unified Diff: ui/base/clipboard/clipboard_test_template.h

Issue 2849603003: Use ScopedTaskEnvironment instead of MessageLoopForUI in ui tests. (Closed)
Patch Set: CR-add-newline-after-include Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/base/clipboard/clipboard_test_template.h
diff --git a/ui/base/clipboard/clipboard_test_template.h b/ui/base/clipboard/clipboard_test_template.h
index 0082870bf56513880c146ac247afa0dc4d4ab771..486b1cba3fa95fc5b876b0e7137a75ba94d27bc5 100644
--- a/ui/base/clipboard/clipboard_test_template.h
+++ b/ui/base/clipboard/clipboard_test_template.h
@@ -17,11 +17,11 @@
#include <memory>
#include <string>
-#include "base/message_loop/message_loop.h"
#include "base/pickle.h"
#include "base/run_loop.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_task_environment.h"
#include "build/build_config.h"
#include "testing/gmock/include/gmock/gmock-matchers.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -56,10 +56,15 @@ class ClipboardTest : public PlatformTest {
public:
#if defined(USE_AURA)
ClipboardTest()
- : event_source_(ClipboardTraits::GetEventSource()),
+ : scoped_task_environment_(
+ base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ event_source_(ClipboardTraits::GetEventSource()),
clipboard_(ClipboardTraits::Create()) {}
#else
- ClipboardTest() : clipboard_(ClipboardTraits::Create()) {}
+ ClipboardTest()
+ : scoped_task_environment_(
+ base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ clipboard_(ClipboardTraits::Create()) {}
#endif
~ClipboardTest() override { ClipboardTraits::Destroy(clipboard_); }
@@ -77,7 +82,7 @@ class ClipboardTest : public PlatformTest {
}
private:
- base::MessageLoopForUI message_loop_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
#if defined(USE_AURA)
std::unique_ptr<PlatformEventSource> event_source_;
#endif

Powered by Google App Engine
This is Rietveld 408576698