| Index: ui/base/test/test_clipboard.h
|
| diff --git a/ui/base/test/test_clipboard.h b/ui/base/test/test_clipboard.h
|
| index 58fa5075fa613abe76ea593552769cdf26013da6..c52212b626d948d55ac4d8ce6eb8a1f7e3a1c0d9 100644
|
| --- a/ui/base/test/test_clipboard.h
|
| +++ b/ui/base/test/test_clipboard.h
|
| @@ -6,6 +6,7 @@
|
| #define UI_BASE_TEST_TEST_CLIPBOARD_H_
|
|
|
| #include <map>
|
| +#include "base/callback.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "ui/base/clipboard/clipboard.h"
|
|
|
| @@ -19,7 +20,7 @@ class TestClipboard : public Clipboard {
|
| // Creates and associates a TestClipboard with the current thread. When no
|
| // longer needed, the returned clipboard must be freed by calling
|
| // Clipboard::DestroyClipboardForCurrentThread() on the same thread.
|
| - static Clipboard* CreateForCurrentThread();
|
| + static TestClipboard* CreateForCurrentThread();
|
|
|
| // Clipboard overrides.
|
| uint64 GetSequenceNumber(ClipboardType type) const override;
|
| @@ -60,6 +61,9 @@ class TestClipboard : public Clipboard {
|
| const char* data_data,
|
| size_t data_len) override;
|
|
|
| + void ResetWaits();
|
| + void WaitForWriteText();
|
| +
|
| private:
|
| struct DataStore {
|
| DataStore();
|
| @@ -81,6 +85,10 @@ class TestClipboard : public Clipboard {
|
| ClipboardType default_store_type_;
|
| mutable std::map<ClipboardType, DataStore> stores_;
|
|
|
| + bool waiting_for_write_text_;
|
| + bool write_text_called_;
|
| + base::Closure write_text_wait_quit_closure_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(TestClipboard);
|
| };
|
|
|
|
|